Strategy11 / formidable-forms

classes/controllers/FrmFieldsController.php

Indentation +342 added lines, -342 removed lines

@@ -2,129 +2,129 @@ 
 
 class FrmFieldsController {
 
-    public static function load_field() {
+	public static function load_field() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        $fields = $_POST['field'];
-        if ( empty( $fields ) ) {
-            wp_die();
-        }
+		$fields = $_POST['field'];
+		if ( empty( $fields ) ) {
+			wp_die();
+		}
 
-        $_GET['page'] = 'formidable';
-        $fields = stripslashes_deep( $fields );
+		$_GET['page'] = 'formidable';
+		$fields = stripslashes_deep( $fields );
 
-        $ajax = true;
+		$ajax = true;
 		$values = array( 'id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ) );
-        $path = FrmAppHelper::plugin_path();
-        $field_html = array();
-
-        foreach ( $fields as $field ) {
-            $field = htmlspecialchars_decode( nl2br( $field ) );
-            $field = json_decode( $field, true );
-            if ( ! isset( $field['id'] ) ) {
-                // this field may have already been loaded
-                continue;
-            }
+		$path = FrmAppHelper::plugin_path();
+		$field_html = array();
+
+		foreach ( $fields as $field ) {
+			$field = htmlspecialchars_decode( nl2br( $field ) );
+			$field = json_decode( $field, true );
+			if ( ! isset( $field['id'] ) ) {
+				// this field may have already been loaded
+				continue;
+			}
 
-            $field_id = absint( $field['id'] );
+			$field_id = absint( $field['id'] );
 
-            if ( ! isset( $field['value'] ) ) {
-                $field['value'] = '';
-            }
+			if ( ! isset( $field['value'] ) ) {
+				$field['value'] = '';
+			}
 
 			$field_name = 'item_meta[' . $field_id . ']';
-            $html_id = FrmFieldsHelper::get_html_id($field);
+			$html_id = FrmFieldsHelper::get_html_id($field);
 
-            ob_start();
+			ob_start();
 			include( $path . '/classes/views/frm-forms/add_field.php' );
-            $field_html[ $field_id ] = ob_get_contents();
-            ob_end_clean();
-        }
+			$field_html[ $field_id ] = ob_get_contents();
+			ob_end_clean();
+		}
 
-        unset($path);
+		unset($path);
 
-        echo json_encode($field_html);
+		echo json_encode($field_html);
 
-        wp_die();
-    }
+		wp_die();
+	}
 
 	/**
 	 * Create a new field with ajax
 	 */
-    public static function create() {
+	public static function create() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_type = FrmAppHelper::get_post_param( 'field_type', '', 'sanitize_text_field' );
 		$form_id = FrmAppHelper::get_post_param( 'form_id', 0, 'absint' );
 
 		$field = self::include_new_field( $field_type, $form_id );
 
-        // this hook will allow for multiple fields to be added at once
-        do_action('frm_after_field_created', $field, $form_id);
+		// this hook will allow for multiple fields to be added at once
+		do_action('frm_after_field_created', $field, $form_id);
 
-        wp_die();
-    }
+		wp_die();
+	}
 
-    /**
-     * Set up and create a new field
-     *
-     * @param string $field_type
-     * @param integer $form_id
-     * @return array|bool
-     */
+	/**
+	 * Set up and create a new field
+	 *
+	 * @param string $field_type
+	 * @param integer $form_id
+	 * @return array|bool
+	 */
 	public static function include_new_field( $field_type, $form_id ) {
-        $values = array();
-        if ( FrmAppHelper::pro_is_installed() ) {
-            $values['post_type'] = FrmProFormsHelper::post_type($form_id);
-        }
+		$values = array();
+		if ( FrmAppHelper::pro_is_installed() ) {
+			$values['post_type'] = FrmProFormsHelper::post_type($form_id);
+		}
 
 		$field_values = FrmFieldsHelper::setup_new_vars( $field_type, $form_id );
-        $field_values = apply_filters( 'frm_before_field_created', $field_values );
+		$field_values = apply_filters( 'frm_before_field_created', $field_values );
 
-        $field_id = FrmField::create( $field_values );
+		$field_id = FrmField::create( $field_values );
 
-        if ( ! $field_id ) {
-            return false;
-        }
+		if ( ! $field_id ) {
+			return false;
+		}
 
-        $field = self::include_single_field($field_id, $values, $form_id);
+		$field = self::include_single_field($field_id, $values, $form_id);
 
-        return $field;
-    }
+		return $field;
+	}
 
 	public static function edit_name( $field = 'name', $id = '' ) {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        if ( empty($field) ) {
-            $field = 'name';
-        }
+		if ( empty($field) ) {
+			$field = 'name';
+		}
 
-        if ( empty($id) ) {
+		if ( empty($id) ) {
 			$id = FrmAppHelper::get_post_param( 'element_id', '', 'sanitize_title' );
 			$id = str_replace( 'field_label_', '', $id );
-        }
+		}
 
 		$value = FrmAppHelper::get_post_param( 'update_value', '', 'wp_kses_post' );
 		$value = trim( $value );
-        if ( trim(strip_tags($value)) == '' ) {
-            // set blank value if there is no content
-            $value = '';
-        }
+		if ( trim(strip_tags($value)) == '' ) {
+			// set blank value if there is no content
+			$value = '';
+		}
 
 		FrmField::update( $id, array( $field => $value ) );
 
 		do_action( 'frm_after_update_field_' . $field, compact( 'id', 'value' ) );
 
 		echo stripslashes( wp_kses_post( $value ) );
-        wp_die();
-    }
+		wp_die();
+	}
 
-    public static function update_ajax_option() {
+	public static function update_ajax_option() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_id = FrmAppHelper::get_post_param( 'field', 0, 'absint' );
 		if ( ! $field_id ) {
@@ -139,252 +139,252 @@ 
 			unset($new_val);
 		}
 
-        FrmField::update( $field_id, array(
-            'field_options' => $field->field_options,
+		FrmField::update( $field_id, array(
+			'field_options' => $field->field_options,
 			'form_id'		=> $field->form_id,
-        ) );
-        wp_die();
-    }
+		) );
+		wp_die();
+	}
 
-    public static function duplicate() {
+	public static function duplicate() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        global $wpdb;
+		global $wpdb;
 
 		$field_id = FrmAppHelper::get_post_param( 'field_id', 0, 'absint' );
 		$form_id = FrmAppHelper::get_post_param( 'form_id', 0, 'absint' );
 
 		$copy_field = FrmField::getOne( $field_id );
-        if ( ! $copy_field ) {
-            wp_die();
-        }
+		if ( ! $copy_field ) {
+			wp_die();
+		}
 
 		do_action( 'frm_duplicate_field', $copy_field, $form_id );
 		do_action( 'frm_duplicate_field_' . $copy_field->type, $copy_field, $form_id );
 
 		$values = array();
-        FrmFieldsHelper::fill_field( $values, $copy_field, $form_id );
+		FrmFieldsHelper::fill_field( $values, $copy_field, $form_id );
 
 		$field_count = FrmDb::get_count( $wpdb->prefix . 'frm_fields fi LEFT JOIN ' . $wpdb->prefix . 'frm_forms fr ON (fi.form_id = fr.id)', array( 'or' => 1, 'fr.id' => $form_id, 'fr.parent_form_id' => $form_id ) );
 
-        $values['field_order'] = $field_count + 1;
+		$values['field_order'] = $field_count + 1;
 
-	    $values = apply_filters( 'frm_prepare_single_field_for_duplication', $values );
+		$values = apply_filters( 'frm_prepare_single_field_for_duplication', $values );
 
 		$field_id = FrmField::create( $values );
 		if ( ! $field_id ) {
 			wp_die();
 		}
 
-        self::include_single_field($field_id, $values);
+		self::include_single_field($field_id, $values);
 
-        wp_die();
-    }
+		wp_die();
+	}
 
-    /**
-     * Load a single field in the form builder along with all needed variables
-     */
-    public static function include_single_field( $field_id, $values, $form_id = 0 ) {
-        $field = FrmFieldsHelper::setup_edit_vars(FrmField::getOne($field_id));
+	/**
+	 * Load a single field in the form builder along with all needed variables
+	 */
+	public static function include_single_field( $field_id, $values, $form_id = 0 ) {
+		$field = FrmFieldsHelper::setup_edit_vars(FrmField::getOne($field_id));
 		$field_name = 'item_meta[' . $field_id . ']';
-        $html_id = FrmFieldsHelper::get_html_id($field);
-        $id = $form_id ? $form_id : $field['form_id'];
-        if ( $field['type'] == 'html' ) {
-            $field['stop_filter'] = true;
-        }
+		$html_id = FrmFieldsHelper::get_html_id($field);
+		$id = $form_id ? $form_id : $field['form_id'];
+		if ( $field['type'] == 'html' ) {
+			$field['stop_filter'] = true;
+		}
 
 		require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_field.php' );
 
-        return $field;
-    }
+		return $field;
+	}
 
-    public static function destroy() {
+	public static function destroy() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_id = FrmAppHelper::get_post_param( 'field_id', 0, 'absint' );
 		FrmField::destroy( $field_id );
-        wp_die();
-    }
+		wp_die();
+	}
 
-    /* Field Options */
+	/* Field Options */
 
-    //Add Single Option or Other Option
-    public static function add_option() {
+	//Add Single Option or Other Option
+	public static function add_option() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$id = FrmAppHelper::get_post_param( 'field_id', 0, 'absint' );
 		$opt_type = FrmAppHelper::get_post_param( 'opt_type', '', 'sanitize_text_field' );
 		$opt_key = FrmAppHelper::get_post_param( 'opt_key', 0, 'absint' );
 
-        $field = FrmField::getOne($id);
+		$field = FrmField::getOne($id);
 
-        if ( 'other' == $opt_type ) {
+		if ( 'other' == $opt_type ) {
 			$opt = __( 'Other', 'formidable' );
-            $other_val = '';
-            $opt_key = 'other_' . $opt_key;
-        } else {
+			$other_val = '';
+			$opt_key = 'other_' . $opt_key;
+		} else {
 			$opt = __( 'New Option', 'formidable' );
-        }
-        $field_val = $opt;
+		}
+		$field_val = $opt;
 
-        $field_data = $field;
+		$field_data = $field;
 		$field = (array) $field;
 		$field['separate_value'] = isset( $field_data->field_options['separate_value'] ) ? $field_data->field_options['separate_value'] : 0;
 		unset( $field_data );
 
 		$field_name = 'item_meta[' . $id . ']';
 		$html_id = FrmFieldsHelper::get_html_id( $field );
-        $checked = '';
+		$checked = '';
 
-        if ( 'other' == $opt_type ) {
+		if ( 'other' == $opt_type ) {
 			include( FrmAppHelper::plugin_path() . '/pro/classes/views/frmpro-fields/other-option.php' );
-        } else {
+		} else {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/single-option.php' );
-        }
-        wp_die();
-    }
+		}
+		wp_die();
+	}
 
-    public static function edit_option() {
+	public static function edit_option() {
 		_deprecated_function( __FUNCTION__, '2.3' );
-    }
+	}
 
-    public static function delete_option() {
+	public static function delete_option() {
 		_deprecated_function( __FUNCTION__, '2.3' );
-    }
+	}
 
-    public static function import_choices() {
-        FrmAppHelper::permission_check( 'frm_edit_forms', 'hide' );
+	public static function import_choices() {
+		FrmAppHelper::permission_check( 'frm_edit_forms', 'hide' );
 
 		$field_id = absint( $_REQUEST['field_id'] );
 
-        global $current_screen, $hook_suffix;
+		global $current_screen, $hook_suffix;
 
-        // Catch plugins that include admin-header.php before admin.php completes.
-        if ( empty( $current_screen ) && function_exists( 'set_current_screen' ) ) {
-            $hook_suffix = '';
-        	set_current_screen();
-        }
+		// Catch plugins that include admin-header.php before admin.php completes.
+		if ( empty( $current_screen ) && function_exists( 'set_current_screen' ) ) {
+			$hook_suffix = '';
+			set_current_screen();
+		}
 
-        if ( function_exists( 'register_admin_color_schemes' ) ) {
-            register_admin_color_schemes();
-        }
+		if ( function_exists( 'register_admin_color_schemes' ) ) {
+			register_admin_color_schemes();
+		}
 
 		$hook_suffix = '';
 		$admin_body_class = '';
 
-        if ( get_user_setting( 'mfold' ) == 'f' ) {
-        	$admin_body_class .= ' folded';
-        }
+		if ( get_user_setting( 'mfold' ) == 'f' ) {
+			$admin_body_class .= ' folded';
+		}
 
-        if ( function_exists( 'is_admin_bar_showing' ) && is_admin_bar_showing() ) {
-        	$admin_body_class .= ' admin-bar';
-        }
+		if ( function_exists( 'is_admin_bar_showing' ) && is_admin_bar_showing() ) {
+			$admin_body_class .= ' admin-bar';
+		}
 
-        if ( is_rtl() ) {
-        	$admin_body_class .= ' rtl';
-        }
+		if ( is_rtl() ) {
+			$admin_body_class .= ' rtl';
+		}
 
-        $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
-        $prepop = array();
-        FrmFieldsHelper::get_bulk_prefilled_opts($prepop);
+		$admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
+		$prepop = array();
+		FrmFieldsHelper::get_bulk_prefilled_opts($prepop);
 
-        $field = FrmField::getOne($field_id);
+		$field = FrmField::getOne($field_id);
 
-        wp_enqueue_script( 'utils' );
+		wp_enqueue_script( 'utils' );
 		wp_enqueue_style( 'formidable-admin', FrmAppHelper::plugin_url() . '/css/frm_admin.css' );
-        FrmAppHelper::load_admin_wide_js();
+		FrmAppHelper::load_admin_wide_js();
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/import_choices.php' );
-        wp_die();
-    }
+		wp_die();
+	}
 
-    public static function import_options() {
+	public static function import_options() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        if ( ! is_admin() || ! current_user_can('frm_edit_forms') ) {
-            return;
-        }
+		if ( ! is_admin() || ! current_user_can('frm_edit_forms') ) {
+			return;
+		}
 
 		$field_id = absint( $_POST['field_id'] );
-        $field = FrmField::getOne($field_id);
+		$field = FrmField::getOne($field_id);
 
 		if ( ! in_array( $field->type, array( 'radio', 'checkbox', 'select' ) ) ) {
-            return;
-        }
+			return;
+		}
 
-        $field = FrmFieldsHelper::setup_edit_vars($field);
+		$field = FrmFieldsHelper::setup_edit_vars($field);
 		$opts = FrmAppHelper::get_param( 'opts', '', 'post', 'wp_kses_post' );
 		$opts = explode( "\n", rtrim( $opts, "\n" ) );
 		$opts = array_map( 'trim', $opts );
 
-        if ( $field['separate_value'] ) {
-            foreach ( $opts as $opt_key => $opt ) {
-                if ( strpos($opt, '|') !== false ) {
-                    $vals = explode('|', $opt);
-                    if ( $vals[0] != $vals[1] ) {
-                        $opts[ $opt_key ] = array( 'label' => trim( $vals[0] ), 'value' => trim( $vals[1] ) );
-                    }
-                    unset($vals);
-                }
-                unset($opt_key, $opt);
-            }
-        }
-
-        //Keep other options after bulk update
-        if ( isset( $field['field_options']['other'] ) && $field['field_options']['other'] == true ) {
-            $other_array = array();
-            foreach ( $field['options'] as $opt_key => $opt ) {
+		if ( $field['separate_value'] ) {
+			foreach ( $opts as $opt_key => $opt ) {
+				if ( strpos($opt, '|') !== false ) {
+					$vals = explode('|', $opt);
+					if ( $vals[0] != $vals[1] ) {
+						$opts[ $opt_key ] = array( 'label' => trim( $vals[0] ), 'value' => trim( $vals[1] ) );
+					}
+					unset($vals);
+				}
+				unset($opt_key, $opt);
+			}
+		}
+
+		//Keep other options after bulk update
+		if ( isset( $field['field_options']['other'] ) && $field['field_options']['other'] == true ) {
+			$other_array = array();
+			foreach ( $field['options'] as $opt_key => $opt ) {
 				if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) {
 					$other_array[ $opt_key ] = $opt;
 				}
-                unset($opt_key, $opt);
-            }
-            if ( ! empty($other_array) ) {
-                $opts = array_merge( $opts, $other_array);
-            }
-        }
+				unset($opt_key, $opt);
+			}
+			if ( ! empty($other_array) ) {
+				$opts = array_merge( $opts, $other_array);
+			}
+		}
 
-        $field['options'] = $opts;
+		$field['options'] = $opts;
 
-        if ( $field['type'] == 'radio' || $field['type'] == 'checkbox' ) {
+		if ( $field['type'] == 'radio' || $field['type'] == 'checkbox' ) {
 			$field_name = 'item_meta[' . $field['id'] . ']';
 
 			// Get html_id which will be used in single-option.php
 			$html_id = FrmFieldsHelper::get_html_id( $field );
 
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/radio.php' );
-        } else {
-            FrmFieldsHelper::show_single_option($field);
-        }
+		} else {
+			FrmFieldsHelper::show_single_option($field);
+		}
 
-        wp_die();
-    }
+		wp_die();
+	}
 
-    public static function update_order() {
+	public static function update_order() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$fields = FrmAppHelper::get_post_param( 'frm_field_id' );
 		foreach ( (array) $fields as $position => $item ) {
 			FrmField::update( absint( $item ), array( 'field_order' => absint( $position ) ) );
 		}
-        wp_die();
-    }
+		wp_die();
+	}
 
 	public static function change_type( $type ) {
-        $type_switch = array(
-            'scale'     => 'radio',
-            '10radio'   => 'radio',
-            'rte'       => 'textarea',
-            'website'   => 'url',
-        );
-        if ( isset( $type_switch[ $type ] ) ) {
-            $type = $type_switch[ $type ];
-        }
+		$type_switch = array(
+			'scale'     => 'radio',
+			'10radio'   => 'radio',
+			'rte'       => 'textarea',
+			'website'   => 'url',
+		);
+		if ( isset( $type_switch[ $type ] ) ) {
+			$type = $type_switch[ $type ];
+		}
 
 		$pro_fields = FrmField::pro_field_selection();
 		$types = array_keys( $pro_fields );
@@ -392,137 +392,137 @@ 
 			$type = 'text';
 		}
 
-        return $type;
-    }
+		return $type;
+	}
 
 	public static function display_field_options( $display ) {
 		switch ( $display['type'] ) {
-            case 'captcha':
-                $display['required'] = false;
-                $display['invalid'] = true;
-                $display['default_blank'] = false;
+			case 'captcha':
+				$display['required'] = false;
+				$display['invalid'] = true;
+				$display['default_blank'] = false;
 				$display['captcha_size'] = true;
-            break;
-            case 'radio':
-                $display['default_blank'] = false;
-            break;
-            case 'text':
-            case 'textarea':
-                $display['size'] = true;
-                $display['clear_on_focus'] = true;
-            break;
-            case 'select':
-                $display['size'] = true;
-            break;
-            case 'url':
-            case 'website':
-            case 'email':
-                $display['size'] = true;
-                $display['clear_on_focus'] = true;
-                $display['invalid'] = true;
-        }
-
-        return $display;
-    }
-
-    public static function input_html( $field, $echo = true ) {
-        $class = array(); //$field['type'];
-        self::add_input_classes($field, $class);
-
-        $add_html = array();
-        self::add_html_size($field, $add_html);
-        self::add_html_length($field, $add_html);
-        self::add_html_placeholder($field, $add_html, $class);
+			break;
+			case 'radio':
+				$display['default_blank'] = false;
+			break;
+			case 'text':
+			case 'textarea':
+				$display['size'] = true;
+				$display['clear_on_focus'] = true;
+			break;
+			case 'select':
+				$display['size'] = true;
+			break;
+			case 'url':
+			case 'website':
+			case 'email':
+				$display['size'] = true;
+				$display['clear_on_focus'] = true;
+				$display['invalid'] = true;
+		}
+
+		return $display;
+	}
+
+	public static function input_html( $field, $echo = true ) {
+		$class = array(); //$field['type'];
+		self::add_input_classes($field, $class);
+
+		$add_html = array();
+		self::add_html_size($field, $add_html);
+		self::add_html_length($field, $add_html);
+		self::add_html_placeholder($field, $add_html, $class);
 		self::add_validation_messages( $field, $add_html );
 
-        $class = apply_filters('frm_field_classes', implode(' ', $class), $field);
+		$class = apply_filters('frm_field_classes', implode(' ', $class), $field);
 
 		FrmFormsHelper::add_html_attr( $class, 'class', $add_html );
 
-        self::add_shortcodes_to_html($field, $add_html);
+		self::add_shortcodes_to_html($field, $add_html);
 
 		$add_html = apply_filters( 'frm_field_extra_html', $add_html, $field );
 		$add_html = ' ' . implode( ' ', $add_html ) . '  ';
 
-        if ( $echo ) {
-            echo $add_html;
-        }
+		if ( $echo ) {
+			echo $add_html;
+		}
 
-        return $add_html;
-    }
+		return $add_html;
+	}
 
 	private static function add_input_classes( $field, array &$class ) {
-        if ( isset($field['input_class']) && ! empty($field['input_class']) ) {
-            $class[] = $field['input_class'];
-        }
+		if ( isset($field['input_class']) && ! empty($field['input_class']) ) {
+			$class[] = $field['input_class'];
+		}
 
-        if ( $field['type'] == 'hidden' || $field['type'] == 'user_id' ) {
-            return;
-        }
+		if ( $field['type'] == 'hidden' || $field['type'] == 'user_id' ) {
+			return;
+		}
 
-        if ( isset($field['size']) && $field['size'] > 0 ) {
-            $class[] = 'auto_width';
-        }
-    }
+		if ( isset($field['size']) && $field['size'] > 0 ) {
+			$class[] = 'auto_width';
+		}
+	}
 
 	private static function add_html_size( $field, array &$add_html ) {
 		if ( ! isset( $field['size'] ) || $field['size'] <= 0 || in_array( $field['type'], array( 'select', 'data', 'time', 'hidden', 'file', 'lookup' ) ) ) {
-            return;
-        }
+			return;
+		}
 
-        if ( FrmAppHelper::is_admin_page('formidable' ) ) {
-            return;
-        }
+		if ( FrmAppHelper::is_admin_page('formidable' ) ) {
+			return;
+		}
 
-        if ( is_numeric($field['size']) ) {
-            $field['size'] .= 'px';
-        }
+		if ( is_numeric($field['size']) ) {
+			$field['size'] .= 'px';
+		}
 
-        $important = apply_filters('frm_use_important_width', 1, $field);
-        // Note: This inline styling must stay since we cannot realistically set a class for every possible field size
+		$important = apply_filters('frm_use_important_width', 1, $field);
+		// Note: This inline styling must stay since we cannot realistically set a class for every possible field size
 		$add_html['style'] = 'style="width:' . esc_attr( $field['size'] ) . ( $important ? ' !important' : '' ) . '"';
 
-        self::add_html_cols($field, $add_html);
-    }
+		self::add_html_cols($field, $add_html);
+	}
 
 	private static function add_html_cols( $field, array &$add_html ) {
 		if ( ! in_array( $field['type'], array( 'textarea', 'rte' ) ) ) {
-            return;
-        }
+			return;
+		}
 
-        // convert to cols for textareas
-        $calc = array(
-            ''      => 9,
-            'px'    => 9,
-            'rem'   => 0.444,
-            'em'    => 0.544,
-        );
+		// convert to cols for textareas
+		$calc = array(
+			''      => 9,
+			'px'    => 9,
+			'rem'   => 0.444,
+			'em'    => 0.544,
+		);
 
-        // include "col" for valid html
-        $unit = trim(preg_replace('/[0-9]+/', '', $field['size']));
+		// include "col" for valid html
+		$unit = trim(preg_replace('/[0-9]+/', '', $field['size']));
 
-        if ( ! isset( $calc[ $unit ] ) ) {
-            return;
-        }
+		if ( ! isset( $calc[ $unit ] ) ) {
+			return;
+		}
 
-        $size = (float) str_replace( $unit, '', $field['size'] ) / $calc[ $unit ];
+		$size = (float) str_replace( $unit, '', $field['size'] ) / $calc[ $unit ];
 
 		$add_html['cols'] = 'cols="' . absint( $size ) . '"';
-    }
+	}
 
 	private static function add_html_length( $field, array &$add_html ) {
-        // check for max setting and if this field accepts maxlength
+		// check for max setting and if this field accepts maxlength
 		if ( FrmField::is_option_empty( $field, 'max' ) || in_array( $field['type'], array( 'textarea', 'rte', 'hidden', 'file' ) ) ) {
-            return;
-        }
+			return;
+		}
 
-        if ( FrmAppHelper::is_admin_page('formidable' ) ) {
-            // don't load on form builder page
-            return;
-        }
+		if ( FrmAppHelper::is_admin_page('formidable' ) ) {
+			// don't load on form builder page
+			return;
+		}
 
 		$add_html['maxlength'] = 'maxlength="' . esc_attr( $field['max'] ) . '"';
-    }
+	}
 
 	private static function add_html_placeholder( $field, array &$add_html, array &$class ) {
 		if ( empty( $field['default_value'] ) || FrmAppHelper::is_admin_page( 'formidable' ) ) {
@@ -530,35 +530,35 @@ 
 		}
 
 		$default_value_array = is_array( $field['default_value'] );
-        if ( ! FrmField::is_option_true( $field, 'clear_on_focus' ) ) {
+		if ( ! FrmField::is_option_true( $field, 'clear_on_focus' ) ) {
 			if ( $default_value_array ) {
 				$field['default_value'] = json_encode( $field['default_value'] );
 			}
 			$add_html['data-frmval'] = 'data-frmval="' . esc_attr( $field['default_value'] ) . '"';
-            return;
-        }
+			return;
+		}
 
 		if ( $default_value_array ) {
 			// don't include a json placeholder
 			return;
 		}
 
-        $frm_settings = FrmAppHelper::get_settings();
+		$frm_settings = FrmAppHelper::get_settings();
 
 		if ( $frm_settings->use_html && ! in_array( $field['type'], array( 'select', 'radio', 'checkbox', 'hidden' ) ) ) {
-            // use HMTL5 placeholder with js fallback
+			// use HMTL5 placeholder with js fallback
 			$add_html['placeholder'] = 'placeholder="' . esc_attr( $field['default_value'] ) . '"';
-            wp_enqueue_script('jquery-placeholder');
-        } else if ( ! $frm_settings->use_html ) {
+			wp_enqueue_script('jquery-placeholder');
+		} else if ( ! $frm_settings->use_html ) {
 			$val = str_replace( array( "\r\n", "\n" ), '\r', addslashes( str_replace( '&#039;', "'", esc_attr( $field['default_value'] ) ) ) );
 			$add_html['data-frmval'] = 'data-frmval="' . esc_attr( $val ) . '"';
-            $class[] = 'frm_toggle_default';
+			$class[] = 'frm_toggle_default';
 
-            if ( $field['value'] == $field['default_value'] ) {
-                $class[] = 'frm_default';
-            }
-        }
-    }
+			if ( $field['value'] == $field['default_value'] ) {
+				$class[] = 'frm_default';
+			}
+		}
+	}
 
 	private static function add_validation_messages( $field, array &$add_html ) {
 		if ( FrmField::is_required( $field ) ) {
@@ -572,44 +572,44 @@ 
 		}
 	}
 
-    private static function add_shortcodes_to_html( $field, array &$add_html ) {
-        if ( FrmField::is_option_empty( $field, 'shortcodes' ) ) {
-            return;
-        }
+	private static function add_shortcodes_to_html( $field, array &$add_html ) {
+		if ( FrmField::is_option_empty( $field, 'shortcodes' ) ) {
+			return;
+		}
 
-        foreach ( $field['shortcodes'] as $k => $v ) {
-            if ( 'opt' === $k ) {
-                continue;
-            }
+		foreach ( $field['shortcodes'] as $k => $v ) {
+			if ( 'opt' === $k ) {
+				continue;
+			}
 
-            if ( is_numeric($k) && strpos($v, '=') ) {
-                $add_html[] = $v;
-            } else if ( ! empty( $k ) && isset( $add_html[ $k ] ) ) {
+			if ( is_numeric($k) && strpos($v, '=') ) {
+				$add_html[] = $v;
+			} else if ( ! empty( $k ) && isset( $add_html[ $k ] ) ) {
 				$add_html[ $k ] = str_replace( $k . '="', $k . '="' . $v, $add_html[ $k ] );
-            } else {
+			} else {
 				$add_html[ $k ] = $k . '="' . esc_attr( $v ) . '"';
-            }
-
-            unset($k, $v);
-        }
-    }
-
-    public static function check_value( $opt, $opt_key, $field ) {
-        if ( is_array( $opt ) ) {
-            if ( FrmField::is_option_true( $field, 'separate_value' ) ) {
-                $opt = isset( $opt['value'] ) ? $opt['value'] : ( isset( $opt['label'] ) ? $opt['label'] : reset( $opt ) );
-            } else {
-                $opt = isset( $opt['label'] ) ? $opt['label'] : reset( $opt );
-            }
-        }
-        return $opt;
-    }
+			}
+
+			unset($k, $v);
+		}
+	}
+
+	public static function check_value( $opt, $opt_key, $field ) {
+		if ( is_array( $opt ) ) {
+			if ( FrmField::is_option_true( $field, 'separate_value' ) ) {
+				$opt = isset( $opt['value'] ) ? $opt['value'] : ( isset( $opt['label'] ) ? $opt['label'] : reset( $opt ) );
+			} else {
+				$opt = isset( $opt['label'] ) ? $opt['label'] : reset( $opt );
+			}
+		}
+		return $opt;
+	}
 
 	public static function check_label( $opt ) {
-        if ( is_array($opt) ) {
-            $opt = (isset($opt['label']) ? $opt['label'] : reset($opt));
-        }
+		if ( is_array($opt) ) {
+			$opt = (isset($opt['label']) ? $opt['label'] : reset($opt));
+		}
 
-        return $opt;
-    }
+		return $opt;
+	}
 }

Spacing +65 added lines, -65 removed lines

@@ -3,7 +3,7 @@ 
 class FrmFieldsController {
 
     public static function load_field() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
         $fields = $_POST['field'];
@@ -34,17 +34,17 @@ 
             }
 
 			$field_name = 'item_meta[' . $field_id . ']';
-            $html_id = FrmFieldsHelper::get_html_id($field);
+            $html_id = FrmFieldsHelper::get_html_id( $field );
 
             ob_start();
 			include( $path . '/classes/views/frm-forms/add_field.php' );
-            $field_html[ $field_id ] = ob_get_contents();
+            $field_html[$field_id] = ob_get_contents();
             ob_end_clean();
         }
 
-        unset($path);
+        unset( $path );
 
-        echo json_encode($field_html);
+        echo json_encode( $field_html );
 
         wp_die();
     }
@@ -53,7 +53,7 @@ 
 	 * Create a new field with ajax
 	 */
     public static function create() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_type = FrmAppHelper::get_post_param( 'field_type', '', 'sanitize_text_field' );
@@ -62,7 +62,7 @@ 
 		$field = self::include_new_field( $field_type, $form_id );
 
         // this hook will allow for multiple fields to be added at once
-        do_action('frm_after_field_created', $field, $form_id);
+        do_action( 'frm_after_field_created', $field, $form_id );
 
         wp_die();
     }
@@ -77,7 +77,7 @@ 
 	public static function include_new_field( $field_type, $form_id ) {
         $values = array();
         if ( FrmAppHelper::pro_is_installed() ) {
-            $values['post_type'] = FrmProFormsHelper::post_type($form_id);
+            $values['post_type'] = FrmProFormsHelper::post_type( $form_id );
         }
 
 		$field_values = FrmFieldsHelper::setup_new_vars( $field_type, $form_id );
@@ -89,27 +89,27 @@ 
             return false;
         }
 
-        $field = self::include_single_field($field_id, $values, $form_id);
+        $field = self::include_single_field( $field_id, $values, $form_id );
 
         return $field;
     }
 
 	public static function edit_name( $field = 'name', $id = '' ) {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        if ( empty($field) ) {
+        if ( empty( $field ) ) {
             $field = 'name';
         }
 
-        if ( empty($id) ) {
+        if ( empty( $id ) ) {
 			$id = FrmAppHelper::get_post_param( 'element_id', '', 'sanitize_title' );
 			$id = str_replace( 'field_label_', '', $id );
         }
 
 		$value = FrmAppHelper::get_post_param( 'update_value', '', 'wp_kses_post' );
 		$value = trim( $value );
-        if ( trim(strip_tags($value)) == '' ) {
+        if ( trim( strip_tags( $value ) ) == '' ) {
             // set blank value if there is no content
             $value = '';
         }
@@ -123,7 +123,7 @@ 
     }
 
     public static function update_ajax_option() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_id = FrmAppHelper::get_post_param( 'field', 0, 'absint' );
@@ -136,7 +136,7 @@ 
 		if ( isset( $_POST['separate_value'] ) ) {
 			$new_val = FrmField::is_option_true( $field, 'separate_value' ) ? 0 : 1;
 			$field->field_options['separate_value'] = $new_val;
-			unset($new_val);
+			unset( $new_val );
 		}
 
         FrmField::update( $field_id, array(
@@ -147,7 +147,7 @@ 
     }
 
     public static function duplicate() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
         global $wpdb;
@@ -177,7 +177,7 @@ 
 			wp_die();
 		}
 
-        self::include_single_field($field_id, $values);
+        self::include_single_field( $field_id, $values );
 
         wp_die();
     }
@@ -186,9 +186,9 @@ 
      * Load a single field in the form builder along with all needed variables
      */
     public static function include_single_field( $field_id, $values, $form_id = 0 ) {
-        $field = FrmFieldsHelper::setup_edit_vars(FrmField::getOne($field_id));
+        $field = FrmFieldsHelper::setup_edit_vars( FrmField::getOne( $field_id ) );
 		$field_name = 'item_meta[' . $field_id . ']';
-        $html_id = FrmFieldsHelper::get_html_id($field);
+        $html_id = FrmFieldsHelper::get_html_id( $field );
         $id = $form_id ? $form_id : $field['form_id'];
         if ( $field['type'] == 'html' ) {
             $field['stop_filter'] = true;
@@ -200,7 +200,7 @@ 
     }
 
     public static function destroy() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_id = FrmAppHelper::get_post_param( 'field_id', 0, 'absint' );
@@ -212,14 +212,14 @@ 
 
     //Add Single Option or Other Option
     public static function add_option() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$id = FrmAppHelper::get_post_param( 'field_id', 0, 'absint' );
 		$opt_type = FrmAppHelper::get_post_param( 'opt_type', '', 'sanitize_text_field' );
 		$opt_key = FrmAppHelper::get_post_param( 'opt_key', 0, 'absint' );
 
-        $field = FrmField::getOne($id);
+        $field = FrmField::getOne( $id );
 
         if ( 'other' == $opt_type ) {
 			$opt = __( 'Other', 'formidable' );
@@ -289,9 +289,9 @@ 
 
         $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
         $prepop = array();
-        FrmFieldsHelper::get_bulk_prefilled_opts($prepop);
+        FrmFieldsHelper::get_bulk_prefilled_opts( $prepop );
 
-        $field = FrmField::getOne($field_id);
+        $field = FrmField::getOne( $field_id );
 
         wp_enqueue_script( 'utils' );
 		wp_enqueue_style( 'formidable-admin', FrmAppHelper::plugin_url() . '/css/frm_admin.css' );
@@ -302,35 +302,35 @@ 
     }
 
     public static function import_options() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        if ( ! is_admin() || ! current_user_can('frm_edit_forms') ) {
+        if ( ! is_admin() || ! current_user_can( 'frm_edit_forms' ) ) {
             return;
         }
 
 		$field_id = absint( $_POST['field_id'] );
-        $field = FrmField::getOne($field_id);
+        $field = FrmField::getOne( $field_id );
 
 		if ( ! in_array( $field->type, array( 'radio', 'checkbox', 'select' ) ) ) {
             return;
         }
 
-        $field = FrmFieldsHelper::setup_edit_vars($field);
+        $field = FrmFieldsHelper::setup_edit_vars( $field );
 		$opts = FrmAppHelper::get_param( 'opts', '', 'post', 'wp_kses_post' );
 		$opts = explode( "\n", rtrim( $opts, "\n" ) );
 		$opts = array_map( 'trim', $opts );
 
         if ( $field['separate_value'] ) {
             foreach ( $opts as $opt_key => $opt ) {
-                if ( strpos($opt, '|') !== false ) {
-                    $vals = explode('|', $opt);
+                if ( strpos( $opt, '|' ) !== false ) {
+                    $vals = explode( '|', $opt );
                     if ( $vals[0] != $vals[1] ) {
-                        $opts[ $opt_key ] = array( 'label' => trim( $vals[0] ), 'value' => trim( $vals[1] ) );
+                        $opts[$opt_key] = array( 'label' => trim( $vals[0] ), 'value' => trim( $vals[1] ) );
                     }
-                    unset($vals);
+                    unset( $vals );
                 }
-                unset($opt_key, $opt);
+                unset( $opt_key, $opt );
             }
         }
 
@@ -339,12 +339,12 @@ 
             $other_array = array();
             foreach ( $field['options'] as $opt_key => $opt ) {
 				if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) {
-					$other_array[ $opt_key ] = $opt;
+					$other_array[$opt_key] = $opt;
 				}
-                unset($opt_key, $opt);
+                unset( $opt_key, $opt );
             }
-            if ( ! empty($other_array) ) {
-                $opts = array_merge( $opts, $other_array);
+            if ( ! empty( $other_array ) ) {
+                $opts = array_merge( $opts, $other_array );
             }
         }
 
@@ -358,14 +358,14 @@ 
 
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/radio.php' );
         } else {
-            FrmFieldsHelper::show_single_option($field);
+            FrmFieldsHelper::show_single_option( $field );
         }
 
         wp_die();
     }
 
     public static function update_order() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$fields = FrmAppHelper::get_post_param( 'frm_field_id' );
@@ -382,8 +382,8 @@ 
             'rte'       => 'textarea',
             'website'   => 'url',
         );
-        if ( isset( $type_switch[ $type ] ) ) {
-            $type = $type_switch[ $type ];
+        if ( isset( $type_switch[$type] ) ) {
+            $type = $type_switch[$type];
         }
 
 		$pro_fields = FrmField::pro_field_selection();
@@ -427,19 +427,19 @@ 
 
     public static function input_html( $field, $echo = true ) {
         $class = array(); //$field['type'];
-        self::add_input_classes($field, $class);
+        self::add_input_classes( $field, $class );
 
         $add_html = array();
-        self::add_html_size($field, $add_html);
-        self::add_html_length($field, $add_html);
-        self::add_html_placeholder($field, $add_html, $class);
+        self::add_html_size( $field, $add_html );
+        self::add_html_length( $field, $add_html );
+        self::add_html_placeholder( $field, $add_html, $class );
 		self::add_validation_messages( $field, $add_html );
 
-        $class = apply_filters('frm_field_classes', implode(' ', $class), $field);
+        $class = apply_filters( 'frm_field_classes', implode( ' ', $class ), $field );
 
 		FrmFormsHelper::add_html_attr( $class, 'class', $add_html );
 
-        self::add_shortcodes_to_html($field, $add_html);
+        self::add_shortcodes_to_html( $field, $add_html );
 
 		$add_html = apply_filters( 'frm_field_extra_html', $add_html, $field );
 		$add_html = ' ' . implode( ' ', $add_html ) . '  ';
@@ -452,7 +452,7 @@ 
     }
 
 	private static function add_input_classes( $field, array &$class ) {
-        if ( isset($field['input_class']) && ! empty($field['input_class']) ) {
+        if ( isset( $field['input_class'] ) && ! empty( $field['input_class'] ) ) {
             $class[] = $field['input_class'];
         }
 
@@ -460,7 +460,7 @@ 
             return;
         }
 
-        if ( isset($field['size']) && $field['size'] > 0 ) {
+        if ( isset( $field['size'] ) && $field['size'] > 0 ) {
             $class[] = 'auto_width';
         }
     }
@@ -470,19 +470,19 @@ 
             return;
         }
 
-        if ( FrmAppHelper::is_admin_page('formidable' ) ) {
+        if ( FrmAppHelper::is_admin_page( 'formidable' ) ) {
             return;
         }
 
-        if ( is_numeric($field['size']) ) {
+        if ( is_numeric( $field['size'] ) ) {
             $field['size'] .= 'px';
         }
 
-        $important = apply_filters('frm_use_important_width', 1, $field);
+        $important = apply_filters( 'frm_use_important_width', 1, $field );
         // Note: This inline styling must stay since we cannot realistically set a class for every possible field size
 		$add_html['style'] = 'style="width:' . esc_attr( $field['size'] ) . ( $important ? ' !important' : '' ) . '"';
 
-        self::add_html_cols($field, $add_html);
+        self::add_html_cols( $field, $add_html );
     }
 
 	private static function add_html_cols( $field, array &$add_html ) {
@@ -499,13 +499,13 @@ 
         );
 
         // include "col" for valid html
-        $unit = trim(preg_replace('/[0-9]+/', '', $field['size']));
+        $unit = trim( preg_replace( '/[0-9]+/', '', $field['size'] ) );
 
-        if ( ! isset( $calc[ $unit ] ) ) {
+        if ( ! isset( $calc[$unit] ) ) {
             return;
         }
 
-        $size = (float) str_replace( $unit, '', $field['size'] ) / $calc[ $unit ];
+        $size = (float) str_replace( $unit, '', $field['size'] ) / $calc[$unit];
 
 		$add_html['cols'] = 'cols="' . absint( $size ) . '"';
     }
@@ -516,7 +516,7 @@ 
             return;
         }
 
-        if ( FrmAppHelper::is_admin_page('formidable' ) ) {
+        if ( FrmAppHelper::is_admin_page( 'formidable' ) ) {
             // don't load on form builder page
             return;
         }
@@ -548,7 +548,7 @@ 
 		if ( $frm_settings->use_html && ! in_array( $field['type'], array( 'select', 'radio', 'checkbox', 'hidden' ) ) ) {
             // use HMTL5 placeholder with js fallback
 			$add_html['placeholder'] = 'placeholder="' . esc_attr( $field['default_value'] ) . '"';
-            wp_enqueue_script('jquery-placeholder');
+            wp_enqueue_script( 'jquery-placeholder' );
         } else if ( ! $frm_settings->use_html ) {
 			$val = str_replace( array( "\r\n", "\n" ), '\r', addslashes( str_replace( ''', "'", esc_attr( $field['default_value'] ) ) ) );
 			$add_html['data-frmval'] = 'data-frmval="' . esc_attr( $val ) . '"';
@@ -582,15 +582,15 @@ 
                 continue;
             }
 
-            if ( is_numeric($k) && strpos($v, '=') ) {
+            if ( is_numeric( $k ) && strpos( $v, '=' ) ) {
                 $add_html[] = $v;
-            } else if ( ! empty( $k ) && isset( $add_html[ $k ] ) ) {
-				$add_html[ $k ] = str_replace( $k . '="', $k . '="' . $v, $add_html[ $k ] );
+            } else if ( ! empty( $k ) && isset( $add_html[$k] ) ) {
+				$add_html[$k] = str_replace( $k . '="', $k . '="' . $v, $add_html[$k] );
             } else {
-				$add_html[ $k ] = $k . '="' . esc_attr( $v ) . '"';
+				$add_html[$k] = $k . '="' . esc_attr( $v ) . '"';
             }
 
-            unset($k, $v);
+            unset( $k, $v );
         }
     }
 
@@ -606,8 +606,8 @@ 
     }
 
 	public static function check_label( $opt ) {
-        if ( is_array($opt) ) {
-            $opt = (isset($opt['label']) ? $opt['label'] : reset($opt));
+        if ( is_array( $opt ) ) {
+            $opt = ( isset( $opt['label'] ) ? $opt['label'] : reset( $opt ) );
         }
 
         return $opt;

classes/helpers/FrmFieldsHelper.php

Indentation +687 added lines, -687 removed lines

@@ -7,71 +7,71 @@ 
 
 	public static function setup_new_vars( $type = '', $form_id = '' ) {
 
-        if ( strpos($type, '|') ) {
-            list($type, $setting) = explode('|', $type);
-        }
-
-        $defaults = self::get_default_field_opts($type, $form_id);
-        $defaults['field_options']['custom_html'] = self::get_default_html($type);
-
-        $values = array();
-
-        foreach ( $defaults as $var => $default ) {
-            if ( $var == 'field_options' ) {
-                $values['field_options'] = array();
-                foreach ( $default as $opt_var => $opt_default ) {
-                    $values['field_options'][ $opt_var ] = $opt_default;
-                    unset($opt_var, $opt_default);
-                }
-            } else {
-                $values[ $var ] = $default;
-            }
-            unset($var, $default);
-        }
-
-        if ( isset( $setting ) && ! empty( $setting ) ) {
-            if ( in_array( $type, array( 'data', 'lookup' ) ) ) {
-                $values['field_options']['data_type'] = $setting;
-            } else {
-                $values['field_options'][ $setting ] = 1;
-            }
-        }
-
-        if ( $type == 'radio' || $type == 'checkbox' ) {
-            $values['options'] = serialize( array(
-                __( 'Option 1', 'formidable' ),
-                __( 'Option 2', 'formidable' ),
-            ) );
-        } else if ( $type == 'select' ) {
-            $values['options'] = serialize( array(
-                '', __( 'Option 1', 'formidable' ),
-            ) );
-        } else if ( $type == 'textarea' ) {
-            $values['field_options']['max'] = '5';
-        } else if ( $type == 'captcha' ) {
-            $frm_settings = FrmAppHelper::get_settings();
-            $values['invalid'] = $frm_settings->re_msg;
-        } else if ( 'url' == $type ) {
-            $values['name'] = __( 'Website', 'formidable' );
-        }
+		if ( strpos($type, '|') ) {
+			list($type, $setting) = explode('|', $type);
+		}
+
+		$defaults = self::get_default_field_opts($type, $form_id);
+		$defaults['field_options']['custom_html'] = self::get_default_html($type);
+
+		$values = array();
+
+		foreach ( $defaults as $var => $default ) {
+			if ( $var == 'field_options' ) {
+				$values['field_options'] = array();
+				foreach ( $default as $opt_var => $opt_default ) {
+					$values['field_options'][ $opt_var ] = $opt_default;
+					unset($opt_var, $opt_default);
+				}
+			} else {
+				$values[ $var ] = $default;
+			}
+			unset($var, $default);
+		}
+
+		if ( isset( $setting ) && ! empty( $setting ) ) {
+			if ( in_array( $type, array( 'data', 'lookup' ) ) ) {
+				$values['field_options']['data_type'] = $setting;
+			} else {
+				$values['field_options'][ $setting ] = 1;
+			}
+		}
+
+		if ( $type == 'radio' || $type == 'checkbox' ) {
+			$values['options'] = serialize( array(
+				__( 'Option 1', 'formidable' ),
+				__( 'Option 2', 'formidable' ),
+			) );
+		} else if ( $type == 'select' ) {
+			$values['options'] = serialize( array(
+				'', __( 'Option 1', 'formidable' ),
+			) );
+		} else if ( $type == 'textarea' ) {
+			$values['field_options']['max'] = '5';
+		} else if ( $type == 'captcha' ) {
+			$frm_settings = FrmAppHelper::get_settings();
+			$values['invalid'] = $frm_settings->re_msg;
+		} else if ( 'url' == $type ) {
+			$values['name'] = __( 'Website', 'formidable' );
+		}
 
 		$fields = FrmField::field_selection();
-        $fields = array_merge($fields, FrmField::pro_field_selection());
+		$fields = array_merge($fields, FrmField::pro_field_selection());
 
-        if ( isset( $fields[ $type ] ) ) {
-            $values['name'] = is_array( $fields[ $type ] ) ? $fields[ $type ]['name'] : $fields[ $type ];
-        }
+		if ( isset( $fields[ $type ] ) ) {
+			$values['name'] = is_array( $fields[ $type ] ) ? $fields[ $type ]['name'] : $fields[ $type ];
+		}
 
-        unset($fields);
+		unset($fields);
 
-        return $values;
-    }
+		return $values;
+	}
 
 	public static function get_html_id( $field, $plus = '' ) {
 		return apply_filters( 'frm_field_html_id', 'field_' . $field['field_key'] . $plus, $field );
-    }
+	}
 
-    public static function setup_edit_vars( $record, $doing_ajax = false ) {
+	public static function setup_edit_vars( $record, $doing_ajax = false ) {
 		$values = array( 'id' => $record->id, 'form_id' => $record->form_id );
 		$defaults = array(
 			'name'          => $record->name,
@@ -84,86 +84,86 @@ 
 		);
 
 		if ( $doing_ajax ) {
-            $values = $values + $defaults;
-            $values['form_name'] = '';
+			$values = $values + $defaults;
+			$values['form_name'] = '';
 		} else {
 			foreach ( $defaults as $var => $default ) {
-                $values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'htmlspecialchars' );
-                unset($var, $default);
-            }
+				$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'htmlspecialchars' );
+				unset($var, $default);
+			}
 
 			$values['form_name'] = $record->form_id ? FrmForm::getName( $record->form_id ) : '';
-        }
+		}
 
 		unset( $defaults );
 
-        $values['options'] = $record->options;
-        $values['field_options'] = $record->field_options;
+		$values['options'] = $record->options;
+		$values['field_options'] = $record->field_options;
 
-        $defaults = self::get_default_field_opts($values['type'], $record, true);
+		$defaults = self::get_default_field_opts($values['type'], $record, true);
 
 		if ( $values['type'] == 'captcha' ) {
-            $frm_settings = FrmAppHelper::get_settings();
-            $defaults['invalid'] = $frm_settings->re_msg;
-        }
+			$frm_settings = FrmAppHelper::get_settings();
+			$defaults['invalid'] = $frm_settings->re_msg;
+		}
 
 		foreach ( $defaults as $opt => $default ) {
-            $values[ $opt ] = isset( $record->field_options[ $opt ] ) ? $record->field_options[ $opt ] : $default;
-            unset($opt, $default);
-        }
+			$values[ $opt ] = isset( $record->field_options[ $opt ] ) ? $record->field_options[ $opt ] : $default;
+			unset($opt, $default);
+		}
 
-        $values['custom_html'] = (isset($record->field_options['custom_html'])) ? $record->field_options['custom_html'] : self::get_default_html($record->type);
+		$values['custom_html'] = (isset($record->field_options['custom_html'])) ? $record->field_options['custom_html'] : self::get_default_html($record->type);
 
 		return apply_filters( 'frm_setup_edit_field_vars', $values, array( 'doing_ajax' => $doing_ajax ) );
-    }
+	}
 
-    public static function get_default_field_opts( $type, $field, $limit = false ) {
-        $field_options = array(
-            'size' => '', 'max' => '', 'label' => '', 'blank' => '',
-            'required_indicator' => '*', 'invalid' => '', 'separate_value' => 0,
-            'clear_on_focus' => 0, 'default_blank' => 0, 'classes' => '',
+	public static function get_default_field_opts( $type, $field, $limit = false ) {
+		$field_options = array(
+			'size' => '', 'max' => '', 'label' => '', 'blank' => '',
+			'required_indicator' => '*', 'invalid' => '', 'separate_value' => 0,
+			'clear_on_focus' => 0, 'default_blank' => 0, 'classes' => '',
 			'custom_html' => '', 'captcha_size' => 'normal', 'captcha_theme' => 'light',
-        );
+		);
 
 		if ( $limit ) {
-            return $field_options;
+			return $field_options;
 		}
 
-        global $wpdb;
+		global $wpdb;
 
-        $form_id = (is_numeric($field)) ? $field : $field->form_id;
+		$form_id = (is_numeric($field)) ? $field : $field->form_id;
 
 		$key = is_numeric( $field ) ? FrmAppHelper::get_unique_key( '', $wpdb->prefix . 'frm_fields', 'field_key' ) : $field->field_key;
 
-        $field_count = FrmDb::get_var( 'frm_fields', array( 'form_id' => $form_id ), 'field_order', array( 'order_by' => 'field_order DESC' ) );
+		$field_count = FrmDb::get_var( 'frm_fields', array( 'form_id' => $form_id ), 'field_order', array( 'order_by' => 'field_order DESC' ) );
 
-        $frm_settings = FrmAppHelper::get_settings();
-        return array(
-            'name' => __( 'Untitled', 'formidable' ), 'description' => '',
+		$frm_settings = FrmAppHelper::get_settings();
+		return array(
+			'name' => __( 'Untitled', 'formidable' ), 'description' => '',
 			'field_key' => $key, 'type' => $type, 'options' => '', 'default_value' => '',
 			'field_order' => $field_count + 1, 'required' => false,
-            'blank' => $frm_settings->blank_msg, 'unique_msg' => $frm_settings->unique_msg,
-            'invalid' => __( 'This field is invalid', 'formidable' ), 'form_id' => $form_id,
+			'blank' => $frm_settings->blank_msg, 'unique_msg' => $frm_settings->unique_msg,
+			'invalid' => __( 'This field is invalid', 'formidable' ), 'form_id' => $form_id,
 			'field_options' => $field_options,
-        );
-    }
+		);
+	}
 
-    public static function fill_field( &$values, $field, $form_id, $new_key = '' ) {
-        global $wpdb;
+	public static function fill_field( &$values, $field, $form_id, $new_key = '' ) {
+		global $wpdb;
 
 		$values['field_key'] = FrmAppHelper::get_unique_key( $new_key, $wpdb->prefix . 'frm_fields', 'field_key' );
-        $values['form_id'] = $form_id;
-        $values['options'] = maybe_serialize($field->options);
-        $values['default_value'] = maybe_serialize($field->default_value);
-
-        foreach ( array( 'name', 'description', 'type', 'field_order', 'field_options', 'required' ) as $col ) {
-            $values[ $col ] = $field->{$col};
-        }
-    }
-
-    /**
-     * @since 2.0
-     */
+		$values['form_id'] = $form_id;
+		$values['options'] = maybe_serialize($field->options);
+		$values['default_value'] = maybe_serialize($field->default_value);
+
+		foreach ( array( 'name', 'description', 'type', 'field_order', 'field_options', 'required' ) as $col ) {
+			$values[ $col ] = $field->{$col};
+		}
+	}
+
+	/**
+	 * @since 2.0
+	 */
 	public static function get_error_msg( $field, $error ) {
 		$frm_settings = FrmAppHelper::get_settings();
 		$default_settings = $frm_settings->default_options();
@@ -192,12 +192,12 @@ 
 	public static function get_default_html( $type = 'text' ) {
 		if ( apply_filters( 'frm_normal_field_type_html', true, $type ) ) {
 			$input = ( in_array( $type, array( 'radio', 'checkbox', 'data' ) ) ) ? '<div class="frm_opt_container">[input]</div>' : '[input]';
-            $for = '';
+			$for = '';
 			if ( ! in_array( $type, array( 'radio', 'checkbox', 'data', 'scale' ) ) ) {
-                $for = 'for="field_[key]"';
-            }
+				$for = 'for="field_[key]"';
+			}
 
-            $default_html = <<<DEFAULT_HTML
+			$default_html = <<<DEFAULT_HTML
 <div id="frm_field_[id]_container" class="frm_form_field form-field [required_class][error_class]">
     <label $for class="frm_primary_label">[field_name]
         <span class="frm_required">[required_label]</span>
@@ -207,82 +207,82 @@ 
     [if error]<div class="frm_error">[error]</div>[/if error]
 </div>
 DEFAULT_HTML;
-        } else {
+		} else {
 			$default_html = apply_filters('frm_other_custom_html', '', $type);
-        }
+		}
 
-        return apply_filters('frm_custom_html', $default_html, $type);
-    }
+		return apply_filters('frm_custom_html', $default_html, $type);
+	}
 
 	public static function replace_shortcodes( $html, $field, $errors = array(), $form = false, $args = array() ) {
-        $html = apply_filters('frm_before_replace_shortcodes', $html, $field, $errors, $form);
+		$html = apply_filters('frm_before_replace_shortcodes', $html, $field, $errors, $form);
 
-        $defaults = array(
+		$defaults = array(
 			'field_name'    => 'item_meta[' . $field['id'] . ']',
 			'field_id'      => $field['id'],
-            'field_plus_id' => '',
-            'section_id'    => '',
-        );
-        $args = wp_parse_args($args, $defaults);
-        $field_name = $args['field_name'];
-        $field_id = $args['field_id'];
-        $html_id = self::get_html_id($field, $args['field_plus_id']);
+			'field_plus_id' => '',
+			'section_id'    => '',
+		);
+		$args = wp_parse_args($args, $defaults);
+		$field_name = $args['field_name'];
+		$field_id = $args['field_id'];
+		$html_id = self::get_html_id($field, $args['field_plus_id']);
 
-        if ( FrmField::is_multiple_select($field) ) {
-            $field_name .= '[]';
-        }
+		if ( FrmField::is_multiple_select($field) ) {
+			$field_name .= '[]';
+		}
 
-        //replace [id]
-        $html = str_replace('[id]', $field_id, $html);
+		//replace [id]
+		$html = str_replace('[id]', $field_id, $html);
 
-        // Remove the for attribute for captcha
-        if ( $field['type'] == 'captcha' ) {
-            $html = str_replace(' for="field_[key]"', '', $html);
-        }
+		// Remove the for attribute for captcha
+		if ( $field['type'] == 'captcha' ) {
+			$html = str_replace(' for="field_[key]"', '', $html);
+		}
 
-        // set the label for
-        $html = str_replace('field_[key]', $html_id, $html);
+		// set the label for
+		$html = str_replace('field_[key]', $html_id, $html);
 
-        //replace [key]
-        $html = str_replace('[key]', $field['field_key'], $html);
+		//replace [key]
+		$html = str_replace('[key]', $field['field_key'], $html);
 
-        //replace [description] and [required_label] and [error]
+		//replace [description] and [required_label] and [error]
 		$required = FrmField::is_required( $field ) ? $field['required_indicator'] : '';
-        if ( ! is_array( $errors ) ) {
-            $errors = array();
-        }
+		if ( ! is_array( $errors ) ) {
+			$errors = array();
+		}
 		$error = isset( $errors[ 'field' . $field_id ] ) ? $errors[ 'field' . $field_id ] : false;
 
-        //If field type is section heading, add class so a bottom margin can be added to either the h3 or description
-        if ( $field['type'] == 'divider' ) {
-            if ( FrmField::is_option_true( $field, 'description' ) ) {
-                $html = str_replace( 'frm_description', 'frm_description frm_section_spacing', $html );
-            } else {
-                $html = str_replace('[label_position]', '[label_position] frm_section_spacing', $html);
-            }
-        }
+		//If field type is section heading, add class so a bottom margin can be added to either the h3 or description
+		if ( $field['type'] == 'divider' ) {
+			if ( FrmField::is_option_true( $field, 'description' ) ) {
+				$html = str_replace( 'frm_description', 'frm_description frm_section_spacing', $html );
+			} else {
+				$html = str_replace('[label_position]', '[label_position] frm_section_spacing', $html);
+			}
+		}
 
 		foreach ( array( 'description' => $field['description'], 'required_label' => $required, 'error' => $error ) as $code => $value ) {
-            self::remove_inline_conditions( ( $value && $value != '' ), $code, $value, $html );
-        }
+			self::remove_inline_conditions( ( $value && $value != '' ), $code, $value, $html );
+		}
 
-        //replace [required_class]
+		//replace [required_class]
 		$required_class = FrmField::is_required( $field ) ? ' frm_required_field' : '';
-        $html = str_replace('[required_class]', $required_class, $html);
+		$html = str_replace('[required_class]', $required_class, $html);
 
-        //replace [label_position]
-        $field['label'] = apply_filters('frm_html_label_position', $field['label'], $field, $form);
-        $field['label'] = ( $field['label'] && $field['label'] != '' ) ? $field['label'] : 'top';
+		//replace [label_position]
+		$field['label'] = apply_filters('frm_html_label_position', $field['label'], $field, $form);
+		$field['label'] = ( $field['label'] && $field['label'] != '' ) ? $field['label'] : 'top';
 		$html = str_replace( '[label_position]', ( ( in_array( $field['type'], array( 'divider', 'end_divider', 'break' ) ) ) ? $field['label'] : ' frm_primary_label' ), $html );
 
-        //replace [field_name]
-        $html = str_replace('[field_name]', $field['name'], $html);
+		//replace [field_name]
+		$html = str_replace('[field_name]', $field['name'], $html);
 
 		self::add_field_div_classes( $field_id, $field, $errors, $html );
 
-        //replace [entry_key]
-        $entry_key = FrmAppHelper::simple_get( 'entry', 'sanitize_title' );
-        $html = str_replace('[entry_key]', $entry_key, $html);
+		//replace [entry_key]
+		$entry_key = FrmAppHelper::simple_get( 'entry', 'sanitize_title' );
+		$html = str_replace('[entry_key]', $entry_key, $html);
 
 		if ( $form ) {
 			$form = (array) $form;
@@ -296,57 +296,57 @@ 
 
 		self::process_wp_shortcodes( $html );
 
-        //replace [input]
-        preg_match_all("/\[(input|deletelink)\b(.*?)(?:(\/))?\]/s", $html, $shortcodes, PREG_PATTERN_ORDER);
-        global $frm_vars;
-        $frm_settings = FrmAppHelper::get_settings();
+		//replace [input]
+		preg_match_all("/\[(input|deletelink)\b(.*?)(?:(\/))?\]/s", $html, $shortcodes, PREG_PATTERN_ORDER);
+		global $frm_vars;
+		$frm_settings = FrmAppHelper::get_settings();
 
-        foreach ( $shortcodes[0] as $short_key => $tag ) {
-            $atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[2][ $short_key ] );
+		foreach ( $shortcodes[0] as $short_key => $tag ) {
+			$atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[2][ $short_key ] );
 			$tag = self::get_shortcode_tag( $shortcodes, $short_key, array( 'conditional' => false, 'conditional_check' => false ) );
 
-            $replace_with = '';
+			$replace_with = '';
 
-            if ( $tag == 'input' ) {
-                if ( isset($atts['opt']) ) {
-                    $atts['opt']--;
-                }
+			if ( $tag == 'input' ) {
+				if ( isset($atts['opt']) ) {
+					$atts['opt']--;
+				}
 
-                $field['input_class'] = isset($atts['class']) ? $atts['class'] : '';
-                if ( isset($atts['class']) ) {
-                    unset($atts['class']);
-                }
+				$field['input_class'] = isset($atts['class']) ? $atts['class'] : '';
+				if ( isset($atts['class']) ) {
+					unset($atts['class']);
+				}
 
-                $field['shortcodes'] = $atts;
-                ob_start();
+				$field['shortcodes'] = $atts;
+				ob_start();
 				include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/input.php' );
-                $replace_with = ob_get_contents();
-                ob_end_clean();
-            } else if ( $tag == 'deletelink' && FrmAppHelper::pro_is_installed() ) {
-                $replace_with = FrmProEntriesController::entry_delete_link($atts);
-            }
+				$replace_with = ob_get_contents();
+				ob_end_clean();
+			} else if ( $tag == 'deletelink' && FrmAppHelper::pro_is_installed() ) {
+				$replace_with = FrmProEntriesController::entry_delete_link($atts);
+			}
 
-            $html = str_replace( $shortcodes[0][ $short_key ], $replace_with, $html );
-        }
+			$html = str_replace( $shortcodes[0][ $short_key ], $replace_with, $html );
+		}
 
-        $html .= "\n";
+		$html .= "\n";
 
-        //Return html if conf_field to prevent loop
-        if ( isset($field['conf_field']) && $field['conf_field'] == 'stop' ) {
-            return $html;
-        }
+		//Return html if conf_field to prevent loop
+		if ( isset($field['conf_field']) && $field['conf_field'] == 'stop' ) {
+			return $html;
+		}
 
-        //If field is in repeating section
-        if ( $args['section_id'] ) {
-            $html = apply_filters('frm_replace_shortcodes', $html, $field, array( 'errors' => $errors, 'form' => $form, 'field_name' => $field_name, 'field_id' => $field_id, 'field_plus_id' => $args['field_plus_id'], 'section_id' => $args['section_id'] ));
-        } else {
-            $html = apply_filters('frm_replace_shortcodes', $html, $field, array( 'errors' => $errors, 'form' => $form ));
-        }
+		//If field is in repeating section
+		if ( $args['section_id'] ) {
+			$html = apply_filters('frm_replace_shortcodes', $html, $field, array( 'errors' => $errors, 'form' => $form, 'field_name' => $field_name, 'field_id' => $field_id, 'field_plus_id' => $args['field_plus_id'], 'section_id' => $args['section_id'] ));
+		} else {
+			$html = apply_filters('frm_replace_shortcodes', $html, $field, array( 'errors' => $errors, 'form' => $form ));
+		}
 
 		self::remove_collapse_shortcode( $html );
 
-        return $html;
-    }
+		return $html;
+	}
 
 	/**
 	 * This filters shortcodes in the field HTML
@@ -411,46 +411,46 @@ 
 		return $classes;
 	}
 
-    public static function remove_inline_conditions( $no_vars, $code, $replace_with, &$html ) {
-        if ( $no_vars ) {
+	public static function remove_inline_conditions( $no_vars, $code, $replace_with, &$html ) {
+		if ( $no_vars ) {
 			$html = str_replace( '[if ' . $code . ']', '', $html );
 			$html = str_replace( '[/if ' . $code . ']', '', $html );
-        } else {
+		} else {
 			$html = preg_replace( '/(\[if\s+' . $code . '\])(.*?)(\[\/if\s+' . $code . '\])/mis', '', $html );
-        }
+		}
 
 		$html = str_replace( '[' . $code . ']', $replace_with, $html );
-    }
+	}
 
 	public static function get_shortcode_tag( $shortcodes, $short_key, $args ) {
 		$args = wp_parse_args( $args, array( 'conditional' => false, 'conditional_check' => false, 'foreach' => false ) );
-        if ( ( $args['conditional'] || $args['foreach'] ) && ! $args['conditional_check'] ) {
-            $args['conditional_check'] = true;
-        }
-
-        $prefix = '';
-        if ( $args['conditional_check'] ) {
-            if ( $args['conditional'] ) {
-                $prefix = 'if ';
-            } else if ( $args['foreach'] ) {
-                $prefix = 'foreach ';
-            }
-        }
-
-        $with_tags = $args['conditional_check'] ? 3 : 2;
-        if ( ! empty( $shortcodes[ $with_tags ][ $short_key ] ) ) {
-            $tag = str_replace( '[' . $prefix, '', $shortcodes[0][ $short_key ] );
-            $tag = str_replace(']', '', $tag);
-            $tags = explode(' ', $tag);
-            if ( is_array($tags) ) {
-                $tag = $tags[0];
-            }
-        } else {
-            $tag = $shortcodes[ $with_tags - 1 ][ $short_key ];
-        }
-
-        return $tag;
-    }
+		if ( ( $args['conditional'] || $args['foreach'] ) && ! $args['conditional_check'] ) {
+			$args['conditional_check'] = true;
+		}
+
+		$prefix = '';
+		if ( $args['conditional_check'] ) {
+			if ( $args['conditional'] ) {
+				$prefix = 'if ';
+			} else if ( $args['foreach'] ) {
+				$prefix = 'foreach ';
+			}
+		}
+
+		$with_tags = $args['conditional_check'] ? 3 : 2;
+		if ( ! empty( $shortcodes[ $with_tags ][ $short_key ] ) ) {
+			$tag = str_replace( '[' . $prefix, '', $shortcodes[0][ $short_key ] );
+			$tag = str_replace(']', '', $tag);
+			$tags = explode(' ', $tag);
+			if ( is_array($tags) ) {
+				$tag = $tags[0];
+			}
+		} else {
+			$tag = $shortcodes[ $with_tags - 1 ][ $short_key ];
+		}
+
+		return $tag;
+	}
 
 	/**
 	 * Remove [collapse_this] if it's still included after all processing
@@ -488,8 +488,8 @@ 
 		}
 		$api_js_url = apply_filters( 'frm_recaptcha_js_url', $api_js_url );
 
-        wp_register_script( 'recaptcha-api', $api_js_url, '', true );
-        wp_enqueue_script( 'recaptcha-api' );
+		wp_register_script( 'recaptcha-api', $api_js_url, '', true );
+		wp_enqueue_script( 'recaptcha-api' );
 
 		// for reverse compatability
 		$field['captcha_size'] = ( $field['captcha_size'] == 'default' ) ? 'normal' : $field['captcha_size'];
@@ -497,40 +497,40 @@ 
 ?>
 <div id="field_<?php echo esc_attr( $field['field_key'] ) ?>" class="<?php echo esc_attr( $class_prefix ) ?>g-recaptcha" data-sitekey="<?php echo esc_attr( $frm_settings->pubkey ) ?>" data-size="<?php echo esc_attr( $field['captcha_size'] ) ?>" data-theme="<?php echo esc_attr( $field['captcha_theme'] ) ?>"></div>
 <?php
-    }
+	}
 
 	public static function show_single_option( $field ) {
-        $field_name = $field['name'];
-        $html_id = self::get_html_id($field);
-        foreach ( $field['options'] as $opt_key => $opt ) {
-            $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-            $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
+		$field_name = $field['name'];
+		$html_id = self::get_html_id($field);
+		foreach ( $field['options'] as $opt_key => $opt ) {
+			$field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
+			$opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
 
-            // If this is an "Other" option, get the HTML for it
+			// If this is an "Other" option, get the HTML for it
 			if ( self::is_other_opt( $opt_key ) ) {
-                // Get string for Other text field, if needed
+				// Get string for Other text field, if needed
 				$other_val = self::get_other_val( compact( 'opt_key', 'field' ) );
 				require( FrmAppHelper::plugin_path() . '/pro/classes/views/frmpro-fields/other-option.php' );
-            } else {
+			} else {
 				require( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/single-option.php' );
-            }
-        }
-    }
+			}
+		}
+	}
 
 	public static function get_term_link( $tax_id ) {
-        $tax = get_taxonomy($tax_id);
-        if ( ! $tax ) {
-            return;
-        }
+		$tax = get_taxonomy($tax_id);
+		if ( ! $tax ) {
+			return;
+		}
 
-        $link = sprintf(
-            __( 'Please add options from the WordPress "%1$s" page', 'formidable' ),
+		$link = sprintf(
+			__( 'Please add options from the WordPress "%1$s" page', 'formidable' ),
 			'<a href="' . esc_url( admin_url( 'edit-tags.php?taxonomy=' . $tax->name ) ) . '" target="_blank">' . ( empty( $tax->labels->name ) ? __( 'Categories' ) : $tax->labels->name ) . '</a>'
-        );
-        unset($tax);
+		);
+		unset($tax);
 
-        return $link;
-    }
+		return $link;
+	}
 
 	public static function value_meets_condition( $observed_value, $cond, $hide_opt ) {
 		// Remove white space from hide_opt
@@ -541,195 +541,195 @@ 
 		$observed_value = wp_kses_post( $observed_value );
 		$hide_opt = wp_kses_post( $hide_opt );
 
-        if ( is_array($observed_value) ) {
-            return self::array_value_condition($observed_value, $cond, $hide_opt);
-        }
-
-        $m = false;
-        if ( $cond == '==' ) {
-            $m = $observed_value == $hide_opt;
-        } else if ( $cond == '!=' ) {
-            $m = $observed_value != $hide_opt;
-        } else if ( $cond == '>' ) {
-            $m = $observed_value > $hide_opt;
-        } else if ( $cond == '<' ) {
-            $m = $observed_value < $hide_opt;
-        } else if ( $cond == 'LIKE' || $cond == 'not LIKE' ) {
-            $m = stripos($observed_value, $hide_opt);
-            if ( $cond == 'not LIKE' ) {
-                $m = ( $m === false ) ? true : false;
-            } else {
-                $m = ( $m === false ) ? false : true;
-            }
-        }
-        return $m;
-    }
+		if ( is_array($observed_value) ) {
+			return self::array_value_condition($observed_value, $cond, $hide_opt);
+		}
+
+		$m = false;
+		if ( $cond == '==' ) {
+			$m = $observed_value == $hide_opt;
+		} else if ( $cond == '!=' ) {
+			$m = $observed_value != $hide_opt;
+		} else if ( $cond == '>' ) {
+			$m = $observed_value > $hide_opt;
+		} else if ( $cond == '<' ) {
+			$m = $observed_value < $hide_opt;
+		} else if ( $cond == 'LIKE' || $cond == 'not LIKE' ) {
+			$m = stripos($observed_value, $hide_opt);
+			if ( $cond == 'not LIKE' ) {
+				$m = ( $m === false ) ? true : false;
+			} else {
+				$m = ( $m === false ) ? false : true;
+			}
+		}
+		return $m;
+	}
 
 	public static function array_value_condition( $observed_value, $cond, $hide_opt ) {
-        $m = false;
-        if ( $cond == '==' ) {
-            if ( is_array($hide_opt) ) {
-                $m = array_intersect($hide_opt, $observed_value);
-                $m = empty($m) ? false : true;
-            } else {
-                $m = in_array($hide_opt, $observed_value);
-            }
-        } else if ( $cond == '!=' ) {
-            $m = ! in_array($hide_opt, $observed_value);
-        } else if ( $cond == '>' ) {
-            $min = min($observed_value);
-            $m = $min > $hide_opt;
-        } else if ( $cond == '<' ) {
-            $max = max($observed_value);
-            $m = $max < $hide_opt;
-        } else if ( $cond == 'LIKE' || $cond == 'not LIKE' ) {
-            foreach ( $observed_value as $ob ) {
-                $m = strpos($ob, $hide_opt);
-                if ( $m !== false ) {
-                    $m = true;
-                    break;
-                }
-            }
-
-            if ( $cond == 'not LIKE' ) {
-                $m = ( $m === false ) ? true : false;
-            }
-        }
-
-        return $m;
-    }
-
-    /**
-     * Replace a few basic shortcodes and field ids
-     * @since 2.0
-     * @return string
-     */
+		$m = false;
+		if ( $cond == '==' ) {
+			if ( is_array($hide_opt) ) {
+				$m = array_intersect($hide_opt, $observed_value);
+				$m = empty($m) ? false : true;
+			} else {
+				$m = in_array($hide_opt, $observed_value);
+			}
+		} else if ( $cond == '!=' ) {
+			$m = ! in_array($hide_opt, $observed_value);
+		} else if ( $cond == '>' ) {
+			$min = min($observed_value);
+			$m = $min > $hide_opt;
+		} else if ( $cond == '<' ) {
+			$max = max($observed_value);
+			$m = $max < $hide_opt;
+		} else if ( $cond == 'LIKE' || $cond == 'not LIKE' ) {
+			foreach ( $observed_value as $ob ) {
+				$m = strpos($ob, $hide_opt);
+				if ( $m !== false ) {
+					$m = true;
+					break;
+				}
+			}
+
+			if ( $cond == 'not LIKE' ) {
+				$m = ( $m === false ) ? true : false;
+			}
+		}
+
+		return $m;
+	}
+
+	/**
+	 * Replace a few basic shortcodes and field ids
+	 * @since 2.0
+	 * @return string
+	 */
 	public static function basic_replace_shortcodes( $value, $form, $entry ) {
-        if ( strpos($value, '[sitename]') !== false ) {
-            $new_value = wp_specialchars_decode( FrmAppHelper::site_name(), ENT_QUOTES );
-            $value = str_replace('[sitename]', $new_value, $value);
-        }
+		if ( strpos($value, '[sitename]') !== false ) {
+			$new_value = wp_specialchars_decode( FrmAppHelper::site_name(), ENT_QUOTES );
+			$value = str_replace('[sitename]', $new_value, $value);
+		}
 
-        $value = apply_filters('frm_content', $value, $form, $entry);
-        $value = do_shortcode($value);
+		$value = apply_filters('frm_content', $value, $form, $entry);
+		$value = do_shortcode($value);
 
-        return $value;
-    }
+		return $value;
+	}
 
 	public static function get_shortcodes( $content, $form_id ) {
-        if ( FrmAppHelper::pro_is_installed() ) {
-            return FrmProDisplaysHelper::get_shortcodes($content, $form_id);
-        }
+		if ( FrmAppHelper::pro_is_installed() ) {
+			return FrmProDisplaysHelper::get_shortcodes($content, $form_id);
+		}
 
-        $fields = FrmField::getAll( array( 'fi.form_id' => (int) $form_id, 'fi.type not' => FrmField::no_save_fields() ) );
+		$fields = FrmField::getAll( array( 'fi.form_id' => (int) $form_id, 'fi.type not' => FrmField::no_save_fields() ) );
 
-        $tagregexp = self::allowed_shortcodes($fields);
+		$tagregexp = self::allowed_shortcodes($fields);
 
-        preg_match_all("/\[(if )?($tagregexp)\b(.*?)(?:(\/))?\](?:(.+?)\[\/\2\])?/s", $content, $matches, PREG_PATTERN_ORDER);
+		preg_match_all("/\[(if )?($tagregexp)\b(.*?)(?:(\/))?\](?:(.+?)\[\/\2\])?/s", $content, $matches, PREG_PATTERN_ORDER);
 
-        return $matches;
-    }
+		return $matches;
+	}
 
 	public static function allowed_shortcodes( $fields = array() ) {
-        $tagregexp = array(
-            'editlink', 'id', 'key', 'ip',
-            'siteurl', 'sitename', 'admin_email',
-            'post[-|_]id', 'created[-|_]at', 'updated[-|_]at', 'updated[-|_]by',
+		$tagregexp = array(
+			'editlink', 'id', 'key', 'ip',
+			'siteurl', 'sitename', 'admin_email',
+			'post[-|_]id', 'created[-|_]at', 'updated[-|_]at', 'updated[-|_]by',
 			'parent[-|_]id',
-        );
+		);
 
-        foreach ( $fields as $field ) {
-            $tagregexp[] = $field->id;
-            $tagregexp[] = $field->field_key;
-        }
+		foreach ( $fields as $field ) {
+			$tagregexp[] = $field->id;
+			$tagregexp[] = $field->field_key;
+		}
 
-        $tagregexp = implode('|', $tagregexp);
-        return $tagregexp;
-    }
+		$tagregexp = implode('|', $tagregexp);
+		return $tagregexp;
+	}
 
 	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
-        $shortcode_values = array(
-           'id'     => $entry->id,
-           'key'    => $entry->item_key,
-           'ip'     => $entry->ip,
-        );
+		$shortcode_values = array(
+		   'id'     => $entry->id,
+		   'key'    => $entry->item_key,
+		   'ip'     => $entry->ip,
+		);
 
-        foreach ( $shortcodes[0] as $short_key => $tag ) {
-            $atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[3][ $short_key ] );
+		foreach ( $shortcodes[0] as $short_key => $tag ) {
+			$atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[3][ $short_key ] );
 
-            if ( ! empty( $shortcodes[3][ $short_key ] ) ) {
+			if ( ! empty( $shortcodes[3][ $short_key ] ) ) {
 				$tag = str_replace( array( '[', ']' ), '', $shortcodes[0][ $short_key ] );
-                $tags = explode(' ', $tag);
-                if ( is_array($tags) ) {
-                    $tag = $tags[0];
-                }
-            } else {
-                $tag = $shortcodes[2][ $short_key ];
-            }
-
-            switch ( $tag ) {
-                case 'id':
-                case 'key':
-                case 'ip':
-                    $replace_with = $shortcode_values[ $tag ];
-                break;
-
-                case 'user_agent':
-                case 'user-agent':
-                    $entry->description = maybe_unserialize($entry->description);
+				$tags = explode(' ', $tag);
+				if ( is_array($tags) ) {
+					$tag = $tags[0];
+				}
+			} else {
+				$tag = $shortcodes[2][ $short_key ];
+			}
+
+			switch ( $tag ) {
+				case 'id':
+				case 'key':
+				case 'ip':
+					$replace_with = $shortcode_values[ $tag ];
+				break;
+
+				case 'user_agent':
+				case 'user-agent':
+					$entry->description = maybe_unserialize($entry->description);
 					$replace_with = FrmEntryFormat::get_browser( $entry->description['browser'] );
-                break;
-
-                case 'created_at':
-                case 'created-at':
-                case 'updated_at':
-                case 'updated-at':
-                    if ( isset($atts['format']) ) {
-                        $time_format = ' ';
-                    } else {
-                        $atts['format'] = get_option('date_format');
-                        $time_format = '';
-                    }
-
-                    $this_tag = str_replace('-', '_', $tag);
-                    $replace_with = FrmAppHelper::get_formatted_time($entry->{$this_tag}, $atts['format'], $time_format);
-                    unset($this_tag);
-                break;
-
-                case 'created_by':
-                case 'created-by':
-                case 'updated_by':
-                case 'updated-by':
-                    $this_tag = str_replace('-', '_', $tag);
+				break;
+
+				case 'created_at':
+				case 'created-at':
+				case 'updated_at':
+				case 'updated-at':
+					if ( isset($atts['format']) ) {
+						$time_format = ' ';
+					} else {
+						$atts['format'] = get_option('date_format');
+						$time_format = '';
+					}
+
+					$this_tag = str_replace('-', '_', $tag);
+					$replace_with = FrmAppHelper::get_formatted_time($entry->{$this_tag}, $atts['format'], $time_format);
+					unset($this_tag);
+				break;
+
+				case 'created_by':
+				case 'created-by':
+				case 'updated_by':
+				case 'updated-by':
+					$this_tag = str_replace('-', '_', $tag);
 					$replace_with = self::get_display_value( $entry->{$this_tag}, (object) array( 'type' => 'user_id' ), $atts );
-                    unset($this_tag);
-                break;
-
-                case 'admin_email':
-                case 'siteurl':
-                case 'frmurl':
-                case 'sitename':
-                case 'get':
-                    $replace_with = self::dynamic_default_values( $tag, $atts );
-                break;
-
-                default:
-                    $field = FrmField::getOne( $tag );
-                    if ( ! $field ) {
-                        break;
-                    }
-
-                    $sep = isset($atts['sep']) ? $atts['sep'] : ', ';
-
-                    $replace_with = FrmEntryMeta::get_meta_value( $entry, $field->id );
-
-                    $atts['entry_id'] = $entry->id;
-                    $atts['entry_key'] = $entry->item_key;
-
-                    if ( isset($atts['show']) && $atts['show'] == 'field_label' ) {
-                        $replace_with = $field->name;
-                    } else if ( isset($atts['show']) && $atts['show'] == 'description' ) {
-                        $replace_with = $field->description;
+					unset($this_tag);
+				break;
+
+				case 'admin_email':
+				case 'siteurl':
+				case 'frmurl':
+				case 'sitename':
+				case 'get':
+					$replace_with = self::dynamic_default_values( $tag, $atts );
+				break;
+
+				default:
+					$field = FrmField::getOne( $tag );
+					if ( ! $field ) {
+						break;
+					}
+
+					$sep = isset($atts['sep']) ? $atts['sep'] : ', ';
+
+					$replace_with = FrmEntryMeta::get_meta_value( $entry, $field->id );
+
+					$atts['entry_id'] = $entry->id;
+					$atts['entry_key'] = $entry->item_key;
+
+					if ( isset($atts['show']) && $atts['show'] == 'field_label' ) {
+						$replace_with = $field->name;
+					} else if ( isset($atts['show']) && $atts['show'] == 'description' ) {
+						$replace_with = $field->description;
 					} else {
 						$string_value = $replace_with;
 						if ( is_array( $replace_with ) ) {
@@ -743,82 +743,82 @@ 
 						}
 					}
 
-                    unset($field);
-                break;
-            }
+					unset($field);
+				break;
+			}
 
-            if ( isset($replace_with) ) {
-                $content = str_replace( $shortcodes[0][ $short_key ], $replace_with, $content );
-            }
+			if ( isset($replace_with) ) {
+				$content = str_replace( $shortcodes[0][ $short_key ], $replace_with, $content );
+			}
 
-            unset($atts, $conditional, $replace_with);
+			unset($atts, $conditional, $replace_with);
 		}
 
 		return $content;
-    }
-
-    /**
-     * Get the value to replace a few standard shortcodes
-     *
-     * @since 2.0
-     * @return string
-     */
-    public static function dynamic_default_values( $tag, $atts = array(), $return_array = false ) {
-        $new_value = '';
-        switch ( $tag ) {
-            case 'admin_email':
-                $new_value = get_option('admin_email');
-                break;
-            case 'siteurl':
-                $new_value = FrmAppHelper::site_url();
-                break;
-            case 'frmurl':
-                $new_value = FrmAppHelper::plugin_url();
-                break;
-            case 'sitename':
-                $new_value = FrmAppHelper::site_name();
-                break;
-            case 'get':
-                $new_value = self::process_get_shortcode( $atts, $return_array );
-                break;
-        }
-
-        return $new_value;
-    }
-
-    /**
-     * Process the [get] shortcode
-     *
-     * @since 2.0
-     * @return string|array
-     */
-    public static function process_get_shortcode( $atts, $return_array = false ) {
-        if ( ! isset($atts['param']) ) {
-            return '';
-        }
-
-        if ( strpos($atts['param'], '&#91;') ) {
-            $atts['param'] = str_replace('&#91;', '[', $atts['param']);
-            $atts['param'] = str_replace('&#93;', ']', $atts['param']);
-        }
-
-        $new_value = FrmAppHelper::get_param($atts['param'], '');
-        $new_value = FrmAppHelper::get_query_var( $new_value, $atts['param'] );
-
-        if ( $new_value == '' ) {
-            if ( ! isset($atts['prev_val']) ) {
-                $atts['prev_val'] = '';
-            }
-
-            $new_value = isset($atts['default']) ? $atts['default'] : $atts['prev_val'];
-        }
-
-        if ( is_array($new_value) && ! $return_array ) {
-            $new_value = implode(', ', $new_value);
-        }
-
-        return $new_value;
-    }
+	}
+
+	/**
+	 * Get the value to replace a few standard shortcodes
+	 *
+	 * @since 2.0
+	 * @return string
+	 */
+	public static function dynamic_default_values( $tag, $atts = array(), $return_array = false ) {
+		$new_value = '';
+		switch ( $tag ) {
+			case 'admin_email':
+				$new_value = get_option('admin_email');
+				break;
+			case 'siteurl':
+				$new_value = FrmAppHelper::site_url();
+				break;
+			case 'frmurl':
+				$new_value = FrmAppHelper::plugin_url();
+				break;
+			case 'sitename':
+				$new_value = FrmAppHelper::site_name();
+				break;
+			case 'get':
+				$new_value = self::process_get_shortcode( $atts, $return_array );
+				break;
+		}
+
+		return $new_value;
+	}
+
+	/**
+	 * Process the [get] shortcode
+	 *
+	 * @since 2.0
+	 * @return string|array
+	 */
+	public static function process_get_shortcode( $atts, $return_array = false ) {
+		if ( ! isset($atts['param']) ) {
+			return '';
+		}
+
+		if ( strpos($atts['param'], '&#91;') ) {
+			$atts['param'] = str_replace('&#91;', '[', $atts['param']);
+			$atts['param'] = str_replace('&#93;', ']', $atts['param']);
+		}
+
+		$new_value = FrmAppHelper::get_param($atts['param'], '');
+		$new_value = FrmAppHelper::get_query_var( $new_value, $atts['param'] );
+
+		if ( $new_value == '' ) {
+			if ( ! isset($atts['prev_val']) ) {
+				$atts['prev_val'] = '';
+			}
+
+			$new_value = isset($atts['default']) ? $atts['default'] : $atts['prev_val'];
+		}
+
+		if ( is_array($new_value) && ! $return_array ) {
+			$new_value = implode(', ', $new_value);
+		}
+
+		return $new_value;
+	}
 
 	public static function get_display_value( $replace_with, $field, $atts = array() ) {
 		$sep = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
@@ -826,14 +826,14 @@ 
 		$replace_with = apply_filters( 'frm_get_' . $field->type . '_display_value', $replace_with, $field, $atts );
 		$replace_with = apply_filters( 'frm_get_display_value', $replace_with, $field, $atts );
 
-        if ( $field->type == 'textarea' || $field->type == 'rte' ) {
-            $autop = isset($atts['wpautop']) ? $atts['wpautop'] : true;
-            if ( apply_filters('frm_use_wpautop', $autop) ) {
-                if ( is_array($replace_with) ) {
-                    $replace_with = implode("\n", $replace_with);
-                }
-                $replace_with = wpautop($replace_with);
-            }
+		if ( $field->type == 'textarea' || $field->type == 'rte' ) {
+			$autop = isset($atts['wpautop']) ? $atts['wpautop'] : true;
+			if ( apply_filters('frm_use_wpautop', $autop) ) {
+				if ( is_array($replace_with) ) {
+					$replace_with = implode("\n", $replace_with);
+				}
+				$replace_with = wpautop($replace_with);
+			}
 			unset( $autop );
 		} else if ( is_array( $replace_with ) ) {
 			$replace_with = implode( $sep, $replace_with );
@@ -843,37 +843,37 @@ 
 	}
 
 	public static function get_field_types( $type ) {
-        $single_input = array(
-            'text', 'textarea', 'rte', 'number', 'email', 'url',
-            'image', 'file', 'date', 'phone', 'hidden', 'time',
-            'user_id', 'tag', 'password',
-        );
+		$single_input = array(
+			'text', 'textarea', 'rte', 'number', 'email', 'url',
+			'image', 'file', 'date', 'phone', 'hidden', 'time',
+			'user_id', 'tag', 'password',
+		);
 		$multiple_input = array( 'radio', 'checkbox', 'select', 'scale', 'lookup' );
 		$other_type = array( 'html', 'break' );
 
 		$field_selection = array_merge( FrmField::pro_field_selection(), FrmField::field_selection() );
 
-        $field_types = array();
-        if ( in_array($type, $single_input) ) {
-            self::field_types_for_input( $single_input, $field_selection, $field_types );
-        } else if ( in_array($type, $multiple_input) ) {
-            self::field_types_for_input( $multiple_input, $field_selection, $field_types );
-        } else if ( in_array($type, $other_type) ) {
-            self::field_types_for_input( $other_type, $field_selection, $field_types );
+		$field_types = array();
+		if ( in_array($type, $single_input) ) {
+			self::field_types_for_input( $single_input, $field_selection, $field_types );
+		} else if ( in_array($type, $multiple_input) ) {
+			self::field_types_for_input( $multiple_input, $field_selection, $field_types );
+		} else if ( in_array($type, $other_type) ) {
+			self::field_types_for_input( $other_type, $field_selection, $field_types );
 		} else if ( isset( $field_selection[ $type ] ) ) {
-            $field_types[ $type ] = $field_selection[ $type ];
-        }
+			$field_types[ $type ] = $field_selection[ $type ];
+		}
 
 		$field_types = apply_filters( 'frm_switch_field_types', $field_types, compact( 'type' ) );
-        return $field_types;
-    }
+		return $field_types;
+	}
 
-    private static function field_types_for_input( $inputs, $fields, &$field_types ) {
-        foreach ( $inputs as $input ) {
-            $field_types[ $input ] = $fields[ $input ];
-            unset($input);
-        }
-    }
+	private static function field_types_for_input( $inputs, $fields, &$field_types ) {
+		foreach ( $inputs as $input ) {
+			$field_types[ $input ] = $fields[ $input ];
+			unset($input);
+		}
+	}
 
 	/**
 	 * Check if current field option is an "other" option
@@ -887,14 +887,14 @@ 
 		return $opt_key && strpos( $opt_key, 'other_' ) === 0;
 	}
 
-    /**
-    * Get value that belongs in "Other" text box
-    *
-    * @since 2.0.6
-    *
-    * @param array $args
-    */
-    public static function get_other_val( $args ) {
+	/**
+	 * Get value that belongs in "Other" text box
+	 *
+	 * @since 2.0.6
+	 *
+	 * @param array $args
+	 */
+	public static function get_other_val( $args ) {
 		$defaults = array(
 			'opt_key' => 0, 'field' => array(),
 			'parent' => false, 'pointer' => false,
@@ -970,20 +970,20 @@ 
 		}
 
 		return $other_val;
-    }
-
-    /**
-    * Check if there is a saved value for the "Other" text field. If so, set it as the $other_val.
-    * Intended for front-end use
-    *
-    * @since 2.0.6
-    *
-    * @param array $args should include field, opt_key and field name
-    * @param boolean $other_opt
-    * @param string $checked
-    * @return string $other_val
-    */
-    public static function prepare_other_input( $args, &$other_opt, &$checked ) {
+	}
+
+	/**
+	 * Check if there is a saved value for the "Other" text field. If so, set it as the $other_val.
+	 * Intended for front-end use
+	 *
+	 * @since 2.0.6
+	 *
+	 * @param array $args should include field, opt_key and field name
+	 * @param boolean $other_opt
+	 * @param string $checked
+	 * @return string $other_val
+	 */
+	public static function prepare_other_input( $args, &$other_opt, &$checked ) {
 		//Check if this is an "Other" option
 		if ( ! self::is_other_opt( $args['opt_key'] ) ) {
 			return;
@@ -999,8 +999,8 @@ 
 			$checked = 'checked="checked" ';
 		}
 
-        return $other_args;
-    }
+		return $other_args;
+	}
 
 	/**
 	 * @param array $args
@@ -1050,8 +1050,8 @@ 
 	 * @since 2.0.6
 	 */
 	public static function include_other_input( $args ) {
-        if ( ! $args['other_opt'] ) {
-        	return;
+		if ( ! $args['other_opt'] ) {
+			return;
 		}
 
 		$classes = array( 'frm_other_input' );
@@ -1072,15 +1072,15 @@ 
 	}
 
 	/**
-	* Get the HTML id for an "Other" text field
-	* Note: This does not affect fields in repeating sections
-	*
-	* @since 2.0.08
-	* @param string $type - field type
-	* @param string $html_id
-	* @param string|boolean $opt_key
-	* @return string $other_id
-	*/
+	 * Get the HTML id for an "Other" text field
+	 * Note: This does not affect fields in repeating sections
+	 *
+	 * @since 2.0.08
+	 * @param string $type - field type
+	 * @param string $html_id
+	 * @param string|boolean $opt_key
+	 * @return string $other_id
+	 */
 	public static function get_other_field_html_id( $type, $html_id, $opt_key = false ) {
 		$other_id = $html_id;
 
@@ -1138,10 +1138,10 @@ 
 	}
 
 	public static function switch_field_ids( $val ) {
-        global $frm_duplicate_ids;
-        $replace = array();
-        $replace_with = array();
-        foreach ( (array) $frm_duplicate_ids as $old => $new ) {
+		global $frm_duplicate_ids;
+		$replace = array();
+		$replace_with = array();
+		foreach ( (array) $frm_duplicate_ids as $old => $new ) {
 			$replace[] = '[if ' . $old . ']';
 			$replace_with[] = '[if ' . $new . ']';
 			$replace[] = '[if ' . $old . ' ';
@@ -1156,153 +1156,153 @@ 
 			$replace_with[] = '[' . $new . ']';
 			$replace[] = '[' . $old . ' ';
 			$replace_with[] = '[' . $new . ' ';
-            unset($old, $new);
-        }
+			unset($old, $new);
+		}
 		if ( is_array( $val ) ) {
 			foreach ( $val as $k => $v ) {
-                $val[ $k ] = str_replace( $replace, $replace_with, $v );
-                unset($k, $v);
-            }
-        } else {
-            $val = str_replace($replace, $replace_with, $val);
-        }
-
-        return $val;
-    }
-
-    public static function get_us_states() {
-        return apply_filters( 'frm_us_states', array(
-            'AL' => 'Alabama', 'AK' => 'Alaska', 'AR' => 'Arkansas', 'AZ' => 'Arizona',
-            'CA' => 'California', 'CO' => 'Colorado', 'CT' => 'Connecticut', 'DE' => 'Delaware',
-            'DC' => 'District of Columbia',
-            'FL' => 'Florida', 'GA' => 'Georgia', 'HI' => 'Hawaii', 'ID' => 'Idaho',
-            'IL' => 'Illinois', 'IN' => 'Indiana', 'IA' => 'Iowa', 'KS' => 'Kansas',
-            'KY' => 'Kentucky', 'LA' => 'Louisiana', 'ME' => 'Maine','MD' => 'Maryland',
-            'MA' => 'Massachusetts', 'MI' => 'Michigan', 'MN' => 'Minnesota', 'MS' => 'Mississippi',
-            'MO' => 'Missouri', 'MT' => 'Montana', 'NE' => 'Nebraska', 'NV' => 'Nevada',
-            'NH' => 'New Hampshire', 'NJ' => 'New Jersey', 'NM' => 'New Mexico', 'NY' => 'New York',
-            'NC' => 'North Carolina', 'ND' => 'North Dakota', 'OH' => 'Ohio', 'OK' => 'Oklahoma',
-            'OR' => 'Oregon', 'PA' => 'Pennsylvania', 'RI' => 'Rhode Island', 'SC' => 'South Carolina',
-            'SD' => 'South Dakota', 'TN' => 'Tennessee', 'TX' => 'Texas', 'UT' => 'Utah',
-            'VT' => 'Vermont', 'VA' => 'Virginia', 'WA' => 'Washington', 'WV' => 'West Virginia',
-            'WI' => 'Wisconsin', 'WY' => 'Wyoming',
-        ) );
-    }
-
-    public static function get_countries() {
-        return apply_filters( 'frm_countries', array(
-            __( 'Afghanistan', 'formidable' ), __( 'Albania', 'formidable' ), __( 'Algeria', 'formidable' ),
-            __( 'American Samoa', 'formidable' ), __( 'Andorra', 'formidable' ), __( 'Angola', 'formidable' ),
-            __( 'Anguilla', 'formidable' ), __( 'Antarctica', 'formidable' ), __( 'Antigua and Barbuda', 'formidable' ),
-            __( 'Argentina', 'formidable' ), __( 'Armenia', 'formidable' ), __( 'Aruba', 'formidable' ),
-            __( 'Australia', 'formidable' ), __( 'Austria', 'formidable' ), __( 'Azerbaijan', 'formidable' ),
-            __( 'Bahamas', 'formidable' ), __( 'Bahrain', 'formidable' ), __( 'Bangladesh', 'formidable' ),
-            __( 'Barbados', 'formidable' ), __( 'Belarus', 'formidable' ), __( 'Belgium', 'formidable' ),
-            __( 'Belize', 'formidable' ), __( 'Benin', 'formidable' ), __( 'Bermuda', 'formidable' ),
-            __( 'Bhutan', 'formidable' ), __( 'Bolivia', 'formidable' ), __( 'Bosnia and Herzegovina', 'formidable' ),
-            __( 'Botswana', 'formidable' ), __( 'Brazil', 'formidable' ), __( 'Brunei', 'formidable' ),
-            __( 'Bulgaria', 'formidable' ), __( 'Burkina Faso', 'formidable' ), __( 'Burundi', 'formidable' ),
-            __( 'Cambodia', 'formidable' ), __( 'Cameroon', 'formidable' ), __( 'Canada', 'formidable' ),
-            __( 'Cape Verde', 'formidable' ), __( 'Cayman Islands', 'formidable' ), __( 'Central African Republic', 'formidable' ),
-            __( 'Chad', 'formidable' ), __( 'Chile', 'formidable' ), __( 'China', 'formidable' ),
-            __( 'Colombia', 'formidable' ), __( 'Comoros', 'formidable' ), __( 'Congo', 'formidable' ),
-            __( 'Costa Rica', 'formidable' ), __( 'C&ocirc;te d\'Ivoire', 'formidable' ), __( 'Croatia', 'formidable' ),
-            __( 'Cuba', 'formidable' ), __( 'Cyprus', 'formidable' ), __( 'Czech Republic', 'formidable' ),
-            __( 'Denmark', 'formidable' ), __( 'Djibouti', 'formidable' ), __( 'Dominica', 'formidable' ),
-            __( 'Dominican Republic', 'formidable' ), __( 'East Timor', 'formidable' ), __( 'Ecuador', 'formidable' ),
-            __( 'Egypt', 'formidable' ), __( 'El Salvador', 'formidable' ), __( 'Equatorial Guinea', 'formidable' ),
-            __( 'Eritrea', 'formidable' ), __( 'Estonia', 'formidable' ), __( 'Ethiopia', 'formidable' ),
-            __( 'Fiji', 'formidable' ), __( 'Finland', 'formidable' ), __( 'France', 'formidable' ),
-            __( 'French Guiana', 'formidable' ), __( 'French Polynesia', 'formidable' ), __( 'Gabon', 'formidable' ),
-            __( 'Gambia', 'formidable' ), __( 'Georgia', 'formidable' ), __( 'Germany', 'formidable' ),
-            __( 'Ghana', 'formidable' ), __( 'Gibraltar', 'formidable' ), __( 'Greece', 'formidable' ),
-            __( 'Greenland', 'formidable' ), __( 'Grenada', 'formidable' ), __( 'Guam', 'formidable' ),
-            __( 'Guatemala', 'formidable' ), __( 'Guinea', 'formidable' ), __( 'Guinea-Bissau', 'formidable' ),
-            __( 'Guyana', 'formidable' ), __( 'Haiti', 'formidable' ), __( 'Honduras', 'formidable' ),
-            __( 'Hong Kong', 'formidable' ), __( 'Hungary', 'formidable' ), __( 'Iceland', 'formidable' ),
-            __( 'India', 'formidable' ), __( 'Indonesia', 'formidable' ), __( 'Iran', 'formidable' ),
-            __( 'Iraq', 'formidable' ), __( 'Ireland', 'formidable' ), __( 'Israel', 'formidable' ),
-            __( 'Italy', 'formidable' ), __( 'Jamaica', 'formidable' ), __( 'Japan', 'formidable' ),
-            __( 'Jordan', 'formidable' ), __( 'Kazakhstan', 'formidable' ), __( 'Kenya', 'formidable' ),
-            __( 'Kiribati', 'formidable' ), __( 'North Korea', 'formidable' ), __( 'South Korea', 'formidable' ),
-            __( 'Kuwait', 'formidable' ), __( 'Kyrgyzstan', 'formidable' ), __( 'Laos', 'formidable' ),
-            __( 'Latvia', 'formidable' ), __( 'Lebanon', 'formidable' ), __( 'Lesotho', 'formidable' ),
-            __( 'Liberia', 'formidable' ), __( 'Libya', 'formidable' ), __( 'Liechtenstein', 'formidable' ),
-            __( 'Lithuania', 'formidable' ), __( 'Luxembourg', 'formidable' ), __( 'Macedonia', 'formidable' ),
-            __( 'Madagascar', 'formidable' ), __( 'Malawi', 'formidable' ), __( 'Malaysia', 'formidable' ),
-            __( 'Maldives', 'formidable' ), __( 'Mali', 'formidable' ), __( 'Malta', 'formidable' ),
-            __( 'Marshall Islands', 'formidable' ), __( 'Mauritania', 'formidable' ), __( 'Mauritius', 'formidable' ),
-            __( 'Mexico', 'formidable' ), __( 'Micronesia', 'formidable' ), __( 'Moldova', 'formidable' ),
-            __( 'Monaco', 'formidable' ), __( 'Mongolia', 'formidable' ), __( 'Montenegro', 'formidable' ),
-            __( 'Montserrat', 'formidable' ), __( 'Morocco', 'formidable' ), __( 'Mozambique', 'formidable' ),
-            __( 'Myanmar', 'formidable' ), __( 'Namibia', 'formidable' ), __( 'Nauru', 'formidable' ),
-            __( 'Nepal', 'formidable' ), __( 'Netherlands', 'formidable' ), __( 'New Zealand', 'formidable' ),
-            __( 'Nicaragua', 'formidable' ), __( 'Niger', 'formidable' ), __( 'Nigeria', 'formidable' ),
-            __( 'Norway', 'formidable' ), __( 'Northern Mariana Islands', 'formidable' ), __( 'Oman', 'formidable' ),
-            __( 'Pakistan', 'formidable' ), __( 'Palau', 'formidable' ), __( 'Palestine', 'formidable' ),
-            __( 'Panama', 'formidable' ), __( 'Papua New Guinea', 'formidable' ), __( 'Paraguay', 'formidable' ),
-            __( 'Peru', 'formidable' ), __( 'Philippines', 'formidable' ), __( 'Poland', 'formidable' ),
-            __( 'Portugal', 'formidable' ), __( 'Puerto Rico', 'formidable' ), __( 'Qatar', 'formidable' ),
-            __( 'Romania', 'formidable' ), __( 'Russia', 'formidable' ), __( 'Rwanda', 'formidable' ),
-            __( 'Saint Kitts and Nevis', 'formidable' ), __( 'Saint Lucia', 'formidable' ),
-            __( 'Saint Vincent and the Grenadines', 'formidable' ), __( 'Samoa', 'formidable' ),
-            __( 'San Marino', 'formidable' ), __( 'Sao Tome and Principe', 'formidable' ), __( 'Saudi Arabia', 'formidable' ),
-            __( 'Senegal', 'formidable' ), __( 'Serbia and Montenegro', 'formidable' ), __( 'Seychelles', 'formidable' ),
-            __( 'Sierra Leone', 'formidable' ), __( 'Singapore', 'formidable' ), __( 'Slovakia', 'formidable' ),
-            __( 'Slovenia', 'formidable' ), __( 'Solomon Islands', 'formidable' ), __( 'Somalia', 'formidable' ),
-            __( 'South Africa', 'formidable' ), __( 'South Sudan', 'formidable' ),
-            __( 'Spain', 'formidable' ), __( 'Sri Lanka', 'formidable' ),
-            __( 'Sudan', 'formidable' ), __( 'Suriname', 'formidable' ), __( 'Swaziland', 'formidable' ),
-            __( 'Sweden', 'formidable' ), __( 'Switzerland', 'formidable' ), __( 'Syria', 'formidable' ),
-            __( 'Taiwan', 'formidable' ), __( 'Tajikistan', 'formidable' ), __( 'Tanzania', 'formidable' ),
-            __( 'Thailand', 'formidable' ), __( 'Togo', 'formidable' ), __( 'Tonga', 'formidable' ),
-            __( 'Trinidad and Tobago', 'formidable' ), __( 'Tunisia', 'formidable' ), __( 'Turkey', 'formidable' ),
-            __( 'Turkmenistan', 'formidable' ), __( 'Tuvalu', 'formidable' ), __( 'Uganda', 'formidable' ),
-            __( 'Ukraine', 'formidable' ), __( 'United Arab Emirates', 'formidable' ), __( 'United Kingdom', 'formidable' ),
-            __( 'United States', 'formidable' ), __( 'Uruguay', 'formidable' ), __( 'Uzbekistan', 'formidable' ),
-            __( 'Vanuatu', 'formidable' ), __( 'Vatican City', 'formidable' ), __( 'Venezuela', 'formidable' ),
-            __( 'Vietnam', 'formidable' ), __( 'Virgin Islands, British', 'formidable' ),
-            __( 'Virgin Islands, U.S.', 'formidable' ), __( 'Yemen', 'formidable' ), __( 'Zambia', 'formidable' ),
-            __( 'Zimbabwe', 'formidable' ),
-        ) );
-    }
+				$val[ $k ] = str_replace( $replace, $replace_with, $v );
+				unset($k, $v);
+			}
+		} else {
+			$val = str_replace($replace, $replace_with, $val);
+		}
+
+		return $val;
+	}
+
+	public static function get_us_states() {
+		return apply_filters( 'frm_us_states', array(
+			'AL' => 'Alabama', 'AK' => 'Alaska', 'AR' => 'Arkansas', 'AZ' => 'Arizona',
+			'CA' => 'California', 'CO' => 'Colorado', 'CT' => 'Connecticut', 'DE' => 'Delaware',
+			'DC' => 'District of Columbia',
+			'FL' => 'Florida', 'GA' => 'Georgia', 'HI' => 'Hawaii', 'ID' => 'Idaho',
+			'IL' => 'Illinois', 'IN' => 'Indiana', 'IA' => 'Iowa', 'KS' => 'Kansas',
+			'KY' => 'Kentucky', 'LA' => 'Louisiana', 'ME' => 'Maine','MD' => 'Maryland',
+			'MA' => 'Massachusetts', 'MI' => 'Michigan', 'MN' => 'Minnesota', 'MS' => 'Mississippi',
+			'MO' => 'Missouri', 'MT' => 'Montana', 'NE' => 'Nebraska', 'NV' => 'Nevada',
+			'NH' => 'New Hampshire', 'NJ' => 'New Jersey', 'NM' => 'New Mexico', 'NY' => 'New York',
+			'NC' => 'North Carolina', 'ND' => 'North Dakota', 'OH' => 'Ohio', 'OK' => 'Oklahoma',
+			'OR' => 'Oregon', 'PA' => 'Pennsylvania', 'RI' => 'Rhode Island', 'SC' => 'South Carolina',
+			'SD' => 'South Dakota', 'TN' => 'Tennessee', 'TX' => 'Texas', 'UT' => 'Utah',
+			'VT' => 'Vermont', 'VA' => 'Virginia', 'WA' => 'Washington', 'WV' => 'West Virginia',
+			'WI' => 'Wisconsin', 'WY' => 'Wyoming',
+		) );
+	}
+
+	public static function get_countries() {
+		return apply_filters( 'frm_countries', array(
+			__( 'Afghanistan', 'formidable' ), __( 'Albania', 'formidable' ), __( 'Algeria', 'formidable' ),
+			__( 'American Samoa', 'formidable' ), __( 'Andorra', 'formidable' ), __( 'Angola', 'formidable' ),
+			__( 'Anguilla', 'formidable' ), __( 'Antarctica', 'formidable' ), __( 'Antigua and Barbuda', 'formidable' ),
+			__( 'Argentina', 'formidable' ), __( 'Armenia', 'formidable' ), __( 'Aruba', 'formidable' ),
+			__( 'Australia', 'formidable' ), __( 'Austria', 'formidable' ), __( 'Azerbaijan', 'formidable' ),
+			__( 'Bahamas', 'formidable' ), __( 'Bahrain', 'formidable' ), __( 'Bangladesh', 'formidable' ),
+			__( 'Barbados', 'formidable' ), __( 'Belarus', 'formidable' ), __( 'Belgium', 'formidable' ),
+			__( 'Belize', 'formidable' ), __( 'Benin', 'formidable' ), __( 'Bermuda', 'formidable' ),
+			__( 'Bhutan', 'formidable' ), __( 'Bolivia', 'formidable' ), __( 'Bosnia and Herzegovina', 'formidable' ),
+			__( 'Botswana', 'formidable' ), __( 'Brazil', 'formidable' ), __( 'Brunei', 'formidable' ),
+			__( 'Bulgaria', 'formidable' ), __( 'Burkina Faso', 'formidable' ), __( 'Burundi', 'formidable' ),
+			__( 'Cambodia', 'formidable' ), __( 'Cameroon', 'formidable' ), __( 'Canada', 'formidable' ),
+			__( 'Cape Verde', 'formidable' ), __( 'Cayman Islands', 'formidable' ), __( 'Central African Republic', 'formidable' ),
+			__( 'Chad', 'formidable' ), __( 'Chile', 'formidable' ), __( 'China', 'formidable' ),
+			__( 'Colombia', 'formidable' ), __( 'Comoros', 'formidable' ), __( 'Congo', 'formidable' ),
+			__( 'Costa Rica', 'formidable' ), __( 'C&ocirc;te d\'Ivoire', 'formidable' ), __( 'Croatia', 'formidable' ),
+			__( 'Cuba', 'formidable' ), __( 'Cyprus', 'formidable' ), __( 'Czech Republic', 'formidable' ),
+			__( 'Denmark', 'formidable' ), __( 'Djibouti', 'formidable' ), __( 'Dominica', 'formidable' ),
+			__( 'Dominican Republic', 'formidable' ), __( 'East Timor', 'formidable' ), __( 'Ecuador', 'formidable' ),
+			__( 'Egypt', 'formidable' ), __( 'El Salvador', 'formidable' ), __( 'Equatorial Guinea', 'formidable' ),
+			__( 'Eritrea', 'formidable' ), __( 'Estonia', 'formidable' ), __( 'Ethiopia', 'formidable' ),
+			__( 'Fiji', 'formidable' ), __( 'Finland', 'formidable' ), __( 'France', 'formidable' ),
+			__( 'French Guiana', 'formidable' ), __( 'French Polynesia', 'formidable' ), __( 'Gabon', 'formidable' ),
+			__( 'Gambia', 'formidable' ), __( 'Georgia', 'formidable' ), __( 'Germany', 'formidable' ),
+			__( 'Ghana', 'formidable' ), __( 'Gibraltar', 'formidable' ), __( 'Greece', 'formidable' ),
+			__( 'Greenland', 'formidable' ), __( 'Grenada', 'formidable' ), __( 'Guam', 'formidable' ),
+			__( 'Guatemala', 'formidable' ), __( 'Guinea', 'formidable' ), __( 'Guinea-Bissau', 'formidable' ),
+			__( 'Guyana', 'formidable' ), __( 'Haiti', 'formidable' ), __( 'Honduras', 'formidable' ),
+			__( 'Hong Kong', 'formidable' ), __( 'Hungary', 'formidable' ), __( 'Iceland', 'formidable' ),
+			__( 'India', 'formidable' ), __( 'Indonesia', 'formidable' ), __( 'Iran', 'formidable' ),
+			__( 'Iraq', 'formidable' ), __( 'Ireland', 'formidable' ), __( 'Israel', 'formidable' ),
+			__( 'Italy', 'formidable' ), __( 'Jamaica', 'formidable' ), __( 'Japan', 'formidable' ),
+			__( 'Jordan', 'formidable' ), __( 'Kazakhstan', 'formidable' ), __( 'Kenya', 'formidable' ),
+			__( 'Kiribati', 'formidable' ), __( 'North Korea', 'formidable' ), __( 'South Korea', 'formidable' ),
+			__( 'Kuwait', 'formidable' ), __( 'Kyrgyzstan', 'formidable' ), __( 'Laos', 'formidable' ),
+			__( 'Latvia', 'formidable' ), __( 'Lebanon', 'formidable' ), __( 'Lesotho', 'formidable' ),
+			__( 'Liberia', 'formidable' ), __( 'Libya', 'formidable' ), __( 'Liechtenstein', 'formidable' ),
+			__( 'Lithuania', 'formidable' ), __( 'Luxembourg', 'formidable' ), __( 'Macedonia', 'formidable' ),
+			__( 'Madagascar', 'formidable' ), __( 'Malawi', 'formidable' ), __( 'Malaysia', 'formidable' ),
+			__( 'Maldives', 'formidable' ), __( 'Mali', 'formidable' ), __( 'Malta', 'formidable' ),
+			__( 'Marshall Islands', 'formidable' ), __( 'Mauritania', 'formidable' ), __( 'Mauritius', 'formidable' ),
+			__( 'Mexico', 'formidable' ), __( 'Micronesia', 'formidable' ), __( 'Moldova', 'formidable' ),
+			__( 'Monaco', 'formidable' ), __( 'Mongolia', 'formidable' ), __( 'Montenegro', 'formidable' ),
+			__( 'Montserrat', 'formidable' ), __( 'Morocco', 'formidable' ), __( 'Mozambique', 'formidable' ),
+			__( 'Myanmar', 'formidable' ), __( 'Namibia', 'formidable' ), __( 'Nauru', 'formidable' ),
+			__( 'Nepal', 'formidable' ), __( 'Netherlands', 'formidable' ), __( 'New Zealand', 'formidable' ),
+			__( 'Nicaragua', 'formidable' ), __( 'Niger', 'formidable' ), __( 'Nigeria', 'formidable' ),
+			__( 'Norway', 'formidable' ), __( 'Northern Mariana Islands', 'formidable' ), __( 'Oman', 'formidable' ),
+			__( 'Pakistan', 'formidable' ), __( 'Palau', 'formidable' ), __( 'Palestine', 'formidable' ),
+			__( 'Panama', 'formidable' ), __( 'Papua New Guinea', 'formidable' ), __( 'Paraguay', 'formidable' ),
+			__( 'Peru', 'formidable' ), __( 'Philippines', 'formidable' ), __( 'Poland', 'formidable' ),
+			__( 'Portugal', 'formidable' ), __( 'Puerto Rico', 'formidable' ), __( 'Qatar', 'formidable' ),
+			__( 'Romania', 'formidable' ), __( 'Russia', 'formidable' ), __( 'Rwanda', 'formidable' ),
+			__( 'Saint Kitts and Nevis', 'formidable' ), __( 'Saint Lucia', 'formidable' ),
+			__( 'Saint Vincent and the Grenadines', 'formidable' ), __( 'Samoa', 'formidable' ),
+			__( 'San Marino', 'formidable' ), __( 'Sao Tome and Principe', 'formidable' ), __( 'Saudi Arabia', 'formidable' ),
+			__( 'Senegal', 'formidable' ), __( 'Serbia and Montenegro', 'formidable' ), __( 'Seychelles', 'formidable' ),
+			__( 'Sierra Leone', 'formidable' ), __( 'Singapore', 'formidable' ), __( 'Slovakia', 'formidable' ),
+			__( 'Slovenia', 'formidable' ), __( 'Solomon Islands', 'formidable' ), __( 'Somalia', 'formidable' ),
+			__( 'South Africa', 'formidable' ), __( 'South Sudan', 'formidable' ),
+			__( 'Spain', 'formidable' ), __( 'Sri Lanka', 'formidable' ),
+			__( 'Sudan', 'formidable' ), __( 'Suriname', 'formidable' ), __( 'Swaziland', 'formidable' ),
+			__( 'Sweden', 'formidable' ), __( 'Switzerland', 'formidable' ), __( 'Syria', 'formidable' ),
+			__( 'Taiwan', 'formidable' ), __( 'Tajikistan', 'formidable' ), __( 'Tanzania', 'formidable' ),
+			__( 'Thailand', 'formidable' ), __( 'Togo', 'formidable' ), __( 'Tonga', 'formidable' ),
+			__( 'Trinidad and Tobago', 'formidable' ), __( 'Tunisia', 'formidable' ), __( 'Turkey', 'formidable' ),
+			__( 'Turkmenistan', 'formidable' ), __( 'Tuvalu', 'formidable' ), __( 'Uganda', 'formidable' ),
+			__( 'Ukraine', 'formidable' ), __( 'United Arab Emirates', 'formidable' ), __( 'United Kingdom', 'formidable' ),
+			__( 'United States', 'formidable' ), __( 'Uruguay', 'formidable' ), __( 'Uzbekistan', 'formidable' ),
+			__( 'Vanuatu', 'formidable' ), __( 'Vatican City', 'formidable' ), __( 'Venezuela', 'formidable' ),
+			__( 'Vietnam', 'formidable' ), __( 'Virgin Islands, British', 'formidable' ),
+			__( 'Virgin Islands, U.S.', 'formidable' ), __( 'Yemen', 'formidable' ), __( 'Zambia', 'formidable' ),
+			__( 'Zimbabwe', 'formidable' ),
+		) );
+	}
 
 	public static function get_bulk_prefilled_opts( array &$prepop ) {
 		$prepop[ __( 'Countries', 'formidable' ) ] = FrmFieldsHelper::get_countries();
 
-        $states = FrmFieldsHelper::get_us_states();
-        $state_abv = array_keys($states);
-        sort($state_abv);
+		$states = FrmFieldsHelper::get_us_states();
+		$state_abv = array_keys($states);
+		sort($state_abv);
 		$prepop[ __( 'U.S. State Abbreviations', 'formidable' ) ] = $state_abv;
 
-        $states = array_values($states);
-        sort($states);
+		$states = array_values($states);
+		sort($states);
 		$prepop[ __( 'U.S. States', 'formidable' ) ] = $states;
-        unset($state_abv, $states);
+		unset($state_abv, $states);
 
 		$prepop[ __( 'Age', 'formidable' ) ] = array(
-            __( 'Under 18', 'formidable' ), __( '18-24', 'formidable' ), __( '25-34', 'formidable' ),
-            __( '35-44', 'formidable' ), __( '45-54', 'formidable' ), __( '55-64', 'formidable' ),
-            __( '65 or Above', 'formidable' ), __( 'Prefer Not to Answer', 'formidable' ),
-        );
+			__( 'Under 18', 'formidable' ), __( '18-24', 'formidable' ), __( '25-34', 'formidable' ),
+			__( '35-44', 'formidable' ), __( '45-54', 'formidable' ), __( '55-64', 'formidable' ),
+			__( '65 or Above', 'formidable' ), __( 'Prefer Not to Answer', 'formidable' ),
+		);
 
 		$prepop[ __( 'Satisfaction', 'formidable' ) ] = array(
-            __( 'Very Satisfied', 'formidable' ), __( 'Satisfied', 'formidable' ), __( 'Neutral', 'formidable' ),
-            __( 'Unsatisfied', 'formidable' ), __( 'Very Unsatisfied', 'formidable' ), __( 'N/A', 'formidable' ),
-        );
+			__( 'Very Satisfied', 'formidable' ), __( 'Satisfied', 'formidable' ), __( 'Neutral', 'formidable' ),
+			__( 'Unsatisfied', 'formidable' ), __( 'Very Unsatisfied', 'formidable' ), __( 'N/A', 'formidable' ),
+		);
 
 		$prepop[ __( 'Importance', 'formidable' ) ] = array(
-            __( 'Very Important', 'formidable' ), __( 'Important', 'formidable' ), __( 'Neutral', 'formidable' ),
-            __( 'Somewhat Important', 'formidable' ), __( 'Not at all Important', 'formidable' ), __( 'N/A', 'formidable' ),
-        );
+			__( 'Very Important', 'formidable' ), __( 'Important', 'formidable' ), __( 'Neutral', 'formidable' ),
+			__( 'Somewhat Important', 'formidable' ), __( 'Not at all Important', 'formidable' ), __( 'N/A', 'formidable' ),
+		);
 
 		$prepop[ __( 'Agreement', 'formidable' ) ] = array(
-            __( 'Strongly Agree', 'formidable' ), __( 'Agree', 'formidable' ), __( 'Neutral', 'formidable' ),
-            __( 'Disagree', 'formidable' ), __( 'Strongly Disagree', 'formidable' ), __( 'N/A', 'formidable' ),
-        );
+			__( 'Strongly Agree', 'formidable' ), __( 'Agree', 'formidable' ), __( 'Neutral', 'formidable' ),
+			__( 'Disagree', 'formidable' ), __( 'Strongly Disagree', 'formidable' ), __( 'N/A', 'formidable' ),
+		);
 
 		$prepop = apply_filters( 'frm_bulk_field_choices', $prepop );
-    }
+	}
 
 	public static function field_selection() {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmField::field_selection' );
@@ -1339,10 +1339,10 @@ 
 		return FrmField::is_required( $field );
 	}
 
-    public static function maybe_get_field( &$field ) {
+	public static function maybe_get_field( &$field ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmField::maybe_get_field' );
 		FrmField::maybe_get_field( $field );
-    }
+	}
 
 	public static function dropdown_categories( $args ) {
 		_deprecated_function( __FUNCTION__, '2.02.07', 'FrmProPost::get_category_dropdown' );