Strategy11 / formidable-forms

classes/views/styles/_buttons.php

Spacing +22 added lines, -22 removed lines

@@ -1,6 +1,6 @@ 
 <p class="frm_no_top_margin">
 	<label for="frm_submit_style">
-		<input type="checkbox" name="<?php echo esc_attr( $frm_style->get_field_name('submit_style') ) ?>" id="frm_submit_style" <?php checked( $style->post_content['submit_style'], 1 ) ?> value="1" />
+		<input type="checkbox" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_style' ) ) ?>" id="frm_submit_style" <?php checked( $style->post_content['submit_style'], 1 ) ?> value="1" />
 		<?php esc_html_e( 'Disable submit button styling', 'formidable' ); ?>
 		<span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'Note: If disabled, you may not see the change take effect until you make 2 more styling changes or click "Update Options".', 'formidable' ) ?>"></span>
 	</label>
@@ -9,10 +9,10 @@ 
 <div class="posttypediv">
 	<ul class="posttype-tabs add-menu-item-tabs">
 		<li <?php echo ( 'default' == $current_tab ? ' class="tabs"' : '' ); ?>>
-    		<a href="<?php echo esc_url('?page=formidable-styles&page-tab=default#tabs-panel-button-default') ?>" class="nav-tab-link" data-type="tabs-panel-button-default" ><?php _e( 'Default', 'formidable' ) ?></a>
+    		<a href="<?php echo esc_url( '?page=formidable-styles&page-tab=default#tabs-panel-button-default' ) ?>" class="nav-tab-link" data-type="tabs-panel-button-default" ><?php _e( 'Default', 'formidable' ) ?></a>
     	</li>
 		<li <?php echo ( 'button-hover' == $current_tab ? ' class="tabs"' : '' ); ?>>
-			<a href="<?php echo esc_url('?page=formidable-styles&page-tab=button-hover#page-button-hover') ?>" class="nav-tab-link" data-type="tabs-panel-button-hover" ><?php _e( 'Hover', 'formidable' ) ?></a>
+			<a href="<?php echo esc_url( '?page=formidable-styles&page-tab=button-hover#page-button-hover' ) ?>" class="nav-tab-link" data-type="tabs-panel-button-hover" ><?php _e( 'Hover', 'formidable' ) ?></a>
 		</li>
 		<li <?php echo ( 'button-click' == $current_tab ? ' class="tabs"' : '' ); ?>>
 			<a href="?page=formidable-styles&page-tab=button-click#tabs-panel-button-click" class="nav-tab-link" data-type="tabs-panel-button-click"><?php _e( 'Click', 'formidable' ) ?></a>
@@ -24,22 +24,22 @@ 
 	?>">
 	    <div class="field-group field-group-border clearfix">
         	<label><?php _e( 'Size', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_font_size') ) ?>" id="frm_submit_font_size" value="<?php echo esc_attr( $style->post_content['submit_font_size'] ) ?>"  size="3" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_font_size' ) ) ?>" id="frm_submit_font_size" value="<?php echo esc_attr( $style->post_content['submit_font_size'] ) ?>"  size="3" />
         </div>
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Width', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_width') ) ?>" id="frm_submit_width" value="<?php echo esc_attr( $style->post_content['submit_width'] ) ?>"  size="5" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_width' ) ) ?>" id="frm_submit_width" value="<?php echo esc_attr( $style->post_content['submit_width'] ) ?>"  size="5" />
         </div>
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Height', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_height') ) ?>" id="frm_submit_height" value="<?php echo esc_attr( $style->post_content['submit_height'] ) ?>"  size="5" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_height' ) ) ?>" id="frm_submit_height" value="<?php echo esc_attr( $style->post_content['submit_height'] ) ?>"  size="5" />
         </div>
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Weight', 'formidable' ) ?></label>
-        	<select name="<?php echo esc_attr( $frm_style->get_field_name('submit_weight') ) ?>" id="frm_submit_weight">
+        	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_weight' ) ) ?>" id="frm_submit_weight">
 				<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
 				<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['submit_weight'], $value ) ?>><?php echo esc_html( $name ) ?></option>
 				<?php } ?>
@@ -48,48 +48,48 @@ 
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Corners', 'formidable' ) ?></label>
-        	<input type="text" value="<?php echo esc_attr( $style->post_content['submit_border_radius'] ) ?>" name="<?php echo esc_attr( $frm_style->get_field_name('submit_border_radius') ) ?>" id="frm_submit_border_radius" size="4"/>
+        	<input type="text" value="<?php echo esc_attr( $style->post_content['submit_border_radius'] ) ?>" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_border_radius' ) ) ?>" id="frm_submit_border_radius" size="4"/>
         </div>
 
         <div class="field-group field-group-border clearfix">
         	<label><?php _e( 'BG Color', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_bg_color') ) ?>" id="frm_submit_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_bg_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_bg_color' ) ) ?>" id="frm_submit_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_bg_color'] ) ?>" />
         </div>
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Text', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_text_color') ) ?>" id="frm_submit_text_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_text_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_text_color' ) ) ?>" id="frm_submit_text_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_text_color'] ) ?>" />
         </div>
 
         <div class="field-group field-group-border clearfix">
         	<label><?php _e( 'Border', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_border_color') ) ?>" id="frm_submit_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_border_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_border_color' ) ) ?>" id="frm_submit_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_border_color'] ) ?>" />
         </div>
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Thickness', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_border_width') ) ?>" id="frm_submit_border_width" value="<?php echo esc_attr( $style->post_content['submit_border_width'] ) ?>" size="4" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_border_width' ) ) ?>" id="frm_submit_border_width" value="<?php echo esc_attr( $style->post_content['submit_border_width'] ) ?>" size="4" />
         </div>
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Shadow', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_shadow_color') ) ?>" id="frm_submit_shadow_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_shadow_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_shadow_color' ) ) ?>" id="frm_submit_shadow_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_shadow_color'] ) ?>" />
         </div>
 
         <div class="clear"></div>
         <div class="field-group field-group-border frm-full">
         	<label><?php _e( 'BG Image', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_bg_img') ) ?>" id="frm_submit_bg_img" value="<?php echo esc_attr( $style->post_content['submit_bg_img'] ) ?>"  />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_bg_img' ) ) ?>" id="frm_submit_bg_img" value="<?php echo esc_attr( $style->post_content['submit_bg_img'] ) ?>"  />
         </div>
 
         <div class="field-group field-group-border clearfix">
         	<label><?php _e( 'Margin', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_margin') ) ?>" id="frm_submit_margin" value="<?php echo esc_attr( $style->post_content['submit_margin'] ) ?>" size="6" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_margin' ) ) ?>" id="frm_submit_margin" value="<?php echo esc_attr( $style->post_content['submit_margin'] ) ?>" size="6" />
         </div>
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Padding', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_padding') ) ?>" id="frm_submit_padding" value="<?php echo esc_attr( $style->post_content['submit_padding'] ) ?>" size="6" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_padding' ) ) ?>" id="frm_submit_padding" value="<?php echo esc_attr( $style->post_content['submit_padding'] ) ?>" size="6" />
         </div>
         <div class="clear"></div>
 	</div><!-- /.tabs-panel -->
@@ -99,17 +99,17 @@ 
 	?>">
 	    <div class="field-group clearfix">
         	<label><?php _e( 'BG Color', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_hover_bg_color') ) ?>" id="frm_submit_hover_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_bg_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_hover_bg_color' ) ) ?>" id="frm_submit_hover_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_bg_color'] ) ?>" />
         </div>
 
         <div class="field-group clearfix">
     	    <label><?php _e( 'Text', 'formidable' ) ?></label>
-    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_hover_color') ) ?>" id="frm_submit_hover_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_color'] ) ?>" />
+    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_hover_color' ) ) ?>" id="frm_submit_hover_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_color'] ) ?>" />
         </div>
 
         <div class="field-group clearfix">
             <label><?php _e( 'Border', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_hover_border_color') ) ?>" id="frm_submit_hover_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_border_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_hover_border_color' ) ) ?>" id="frm_submit_hover_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_border_color'] ) ?>" />
         </div>
 
 	    <div class="clear"></div>
@@ -120,17 +120,17 @@ 
 	?>">
 	    <div class="field-group clearfix">
         	<label><?php _e( 'BG Color', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_active_bg_color') ) ?>" id="frm_submit_active_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_bg_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_active_bg_color' ) ) ?>" id="frm_submit_active_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_bg_color'] ) ?>" />
         </div>
 
         <div class="field-group clearfix">
     	    <label><?php _e( 'Text', 'formidable' ) ?></label>
-    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_active_color') ) ?>" id="frm_submit_active_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_color'] ) ?>" />
+    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_active_color' ) ) ?>" id="frm_submit_active_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_color'] ) ?>" />
         </div>
 
         <div class="field-group clearfix">
             <label><?php _e( 'Border', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_active_border_color') ) ?>" id="frm_submit_active_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_border_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_active_border_color' ) ) ?>" id="frm_submit_active_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_border_color'] ) ?>" />
         </div>
 
 	    <div class="clear"></div>

classes/controllers/FrmSettingsController.php

Indentation +44 added lines, -44 removed lines

@@ -2,26 +2,26 @@ 
 
 class FrmSettingsController {
 
-    public static function menu() {
+	public static function menu() {
 		// Make sure admins can see the menu items
 		FrmAppHelper::force_capability( 'frm_change_settings' );
 
-        add_submenu_page( 'formidable', 'Formidable | ' . __( 'Global Settings', 'formidable' ), __( 'Global Settings', 'formidable' ), 'frm_change_settings', 'formidable-settings', 'FrmSettingsController::route' );
-    }
+		add_submenu_page( 'formidable', 'Formidable | ' . __( 'Global Settings', 'formidable' ), __( 'Global Settings', 'formidable' ), 'frm_change_settings', 'formidable-settings', 'FrmSettingsController::route' );
+	}
 
-    public static function license_box() {
+	public static function license_box() {
 		$a = FrmAppHelper::simple_get( 't', 'sanitize_title', 'general_settings' );
-        include( FrmAppHelper::plugin_path() . '/classes/views/frm-settings/license_box.php' );
-    }
+		include( FrmAppHelper::plugin_path() . '/classes/views/frm-settings/license_box.php' );
+	}
 
-    public static function display_form( $errors = array(), $message = '' ) {
-        global $frm_vars;
+	public static function display_form( $errors = array(), $message = '' ) {
+		global $frm_vars;
 
-        $frm_settings = FrmAppHelper::get_settings();
-        $frm_roles = FrmAppHelper::frm_capabilities();
+		$frm_settings = FrmAppHelper::get_settings();
+		$frm_roles = FrmAppHelper::frm_capabilities();
 
-        $uploads = wp_upload_dir();
-        $target_path = $uploads['basedir'] . '/formidable/css';
+		$uploads = wp_upload_dir();
+		$target_path = $uploads['basedir'] . '/formidable/css';
 
 		$sections = array();
 		if ( apply_filters( 'frm_include_addon_page', false ) ) {
@@ -30,53 +30,53 @@ 
 				'name' => __( 'Plugin Licenses', 'formidable' ),
 			);
 		}
-        $sections = apply_filters( 'frm_add_settings_section', $sections );
+		$sections = apply_filters( 'frm_add_settings_section', $sections );
 
-        $captcha_lang = FrmAppHelper::locales( 'captcha' );
+		$captcha_lang = FrmAppHelper::locales( 'captcha' );
 
-        require( FrmAppHelper::plugin_path() . '/classes/views/frm-settings/form.php' );
-    }
+		require( FrmAppHelper::plugin_path() . '/classes/views/frm-settings/form.php' );
+	}
 
-    public static function process_form( $stop_load = false ) {
-        global $frm_vars;
+	public static function process_form( $stop_load = false ) {
+		global $frm_vars;
 
-        $frm_settings = FrmAppHelper::get_settings();
+		$frm_settings = FrmAppHelper::get_settings();
 
 		$process_form = FrmAppHelper::get_post_param( 'process_form', '', 'sanitize_text_field' );
 		if ( ! wp_verify_nonce( $process_form, 'process_form_nonce' ) ) {
-            wp_die( $frm_settings->admin_permission );
-        }
+			wp_die( $frm_settings->admin_permission );
+		}
 
-        $errors = array();
-        $message = '';
+		$errors = array();
+		$message = '';
 
-        if ( ! isset( $frm_vars['settings_routed'] ) || ! $frm_vars['settings_routed'] ) {
-            //$errors = $frm_settings->validate($_POST,array());
-            $frm_settings->update( stripslashes_deep( $_POST ) );
+		if ( ! isset( $frm_vars['settings_routed'] ) || ! $frm_vars['settings_routed'] ) {
+			//$errors = $frm_settings->validate($_POST,array());
+			$frm_settings->update( stripslashes_deep( $_POST ) );
 
-            if ( empty( $errors ) ) {
-                $frm_settings->store();
-                $message = __( 'Settings Saved', 'formidable' );
-            }
-        } else {
-            $message = __( 'Settings Saved', 'formidable' );
-        }
+			if ( empty( $errors ) ) {
+				$frm_settings->store();
+				$message = __( 'Settings Saved', 'formidable' );
+			}
+		} else {
+			$message = __( 'Settings Saved', 'formidable' );
+		}
 
 		if ( $stop_load == 'stop_load' ) {
-            $frm_vars['settings_routed'] = true;
-            return;
-        }
+			$frm_vars['settings_routed'] = true;
+			return;
+		}
 
-        self::display_form( $errors, $message );
-    }
+		self::display_form( $errors, $message );
+	}
 
-    public static function route( $stop_load = false ) {
-        $action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
+	public static function route( $stop_load = false ) {
+		$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
 		$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
-        if ( $action == 'process-form' ) {
+		if ( $action == 'process-form' ) {
 			self::process_form( $stop_load );
-        } else if ( $stop_load != 'stop_load' ) {
+		} else if ( $stop_load != 'stop_load' ) {
 			self::display_form();
-        }
-    }
+		}
+	}
 }

classes/views/styles/_field-description.php

Spacing +10 added lines, -10 removed lines

@@ -1,10 +1,10 @@ 
 <div class="field-group field-group-background clearfix frm-first-row">
 	<label><?php _e( 'Color', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('description_color') ) ?>" id="frm_description_color" class="hex" value="<?php echo esc_attr( $style->post_content['description_color'] ) ?>" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'description_color' ) ) ?>" id="frm_description_color" class="hex" value="<?php echo esc_attr( $style->post_content['description_color'] ) ?>" />
 </div>
 <div class="field-group clearfix frm-first-row">
 	<label><?php _e( 'Weight', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('description_weight') ) ?>" id="frm_description_weight">
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'description_weight' ) ) ?>" id="frm_description_weight">
 		<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
 		<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['description_weight'], $value ) ?>><?php echo esc_html( $name ) ?></option>
 		<?php } ?>
@@ -12,25 +12,25 @@ 
 </div>
 <div class="field-group clearfix frm-first-row">
 	<label><?php _e( 'Style', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('description_style') ) ?>" id="frm_description_style">
-		<option value="normal" <?php selected($style->post_content['description_style'], 'normal') ?>><?php _e( 'normal', 'formidable' ) ?></option>
-		<option value="italic" <?php selected($style->post_content['description_style'], 'italic') ?>><?php _e( 'italic', 'formidable' ) ?></option>
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'description_style' ) ) ?>" id="frm_description_style">
+		<option value="normal" <?php selected( $style->post_content['description_style'], 'normal' ) ?>><?php _e( 'normal', 'formidable' ) ?></option>
+		<option value="italic" <?php selected( $style->post_content['description_style'], 'italic' ) ?>><?php _e( 'italic', 'formidable' ) ?></option>
 	</select>
 </div>
 
 <div class="field-group clearfix">
 	<label><?php _e( 'Size', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('description_font_size') ) ?>" id="frm_description_font_size" value="<?php echo esc_attr( $style->post_content['description_font_size'] ) ?>"  size="3" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'description_font_size' ) ) ?>" id="frm_description_font_size" value="<?php echo esc_attr( $style->post_content['description_font_size'] ) ?>"  size="3" />
 </div>
 <div class="field-group clearfix">
 	<label><?php _e( 'Align', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('description_align') ) ?>" id="frm_description_align">
-		<option value="left" <?php selected($style->post_content['description_align'], 'left') ?>><?php _e( 'left', 'formidable' ) ?></option>
-		<option value="right" <?php selected($style->post_content['description_align'], 'right') ?>><?php _e( 'right', 'formidable' ) ?></option>
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'description_align' ) ) ?>" id="frm_description_align">
+		<option value="left" <?php selected( $style->post_content['description_align'], 'left' ) ?>><?php _e( 'left', 'formidable' ) ?></option>
+		<option value="right" <?php selected( $style->post_content['description_align'], 'right' ) ?>><?php _e( 'right', 'formidable' ) ?></option>
 	</select>
 </div>
 <div class="field-group clearfix">
 	<label><?php _e( 'Margin', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('description_margin') ) ?>" id="frm_description_margin" value="<?php echo esc_attr( $style->post_content['description_margin'] ) ?>"  size="3" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'description_margin' ) ) ?>" id="frm_description_margin" value="<?php echo esc_attr( $style->post_content['description_margin'] ) ?>"  size="3" />
 </div>
 <div class="clear"></div>

classes/controllers/FrmFormsController.php

Indentation +596 added lines, -596 removed lines

@@ -2,7 +2,7 @@ 
 
 class FrmFormsController {
 
-    public static function menu() {
+	public static function menu() {
 		$menu_label = __( 'Forms', 'formidable' );
 		if ( ! FrmAppHelper::pro_is_installed() ) {
 			$menu_label .= ' (Lite)';
@@ -10,7 +10,7 @@ 
 		add_submenu_page('formidable', 'Formidable | ' . $menu_label, $menu_label, 'frm_view_forms', 'formidable', 'FrmFormsController::route' );
 
 		self::maybe_load_listing_hooks();
-    }
+	}
 
 	public static function maybe_load_listing_hooks() {
 		$action = FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' );
@@ -24,128 +24,128 @@ 
 		add_filter('manage_toplevel_page_formidable_sortable_columns', 'FrmFormsController::get_sortable_columns' );
 	}
 
-    public static function head() {
-        wp_enqueue_script('formidable-editinplace');
+	public static function head() {
+		wp_enqueue_script('formidable-editinplace');
 
-        if ( wp_is_mobile() ) {
-    		wp_enqueue_script( 'jquery-touch-punch' );
-    	}
-    }
+		if ( wp_is_mobile() ) {
+			wp_enqueue_script( 'jquery-touch-punch' );
+		}
+	}
 
-    public static function register_widgets() {
-        require_once(FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php');
-        register_widget('FrmShowForm');
-    }
+	public static function register_widgets() {
+		require_once(FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php');
+		register_widget('FrmShowForm');
+	}
 
-    public static function list_form() {
-        FrmAppHelper::permission_check('frm_view_forms');
+	public static function list_form() {
+		FrmAppHelper::permission_check('frm_view_forms');
 
 		$params = FrmForm::list_page_params();
-        $errors = self::process_bulk_form_actions( array());
-        $errors = apply_filters('frm_admin_list_form_action', $errors);
+		$errors = self::process_bulk_form_actions( array());
+		$errors = apply_filters('frm_admin_list_form_action', $errors);
 
 		return self::display_forms_list( $params, '', $errors );
-    }
+	}
 
 	public static function new_form( $values = array() ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check('frm_edit_forms');
 
-        global $frm_vars;
+		global $frm_vars;
 
-        $action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
+		$action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
 		$action = empty( $values ) ? FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' ) : $values[ $action ];
 
 		if ( $action == 'create' ) {
-            return self::create($values);
+			return self::create($values);
 		} else if ( $action == 'new' ) {
 			$frm_field_selection = FrmField::field_selection();
-            $values = FrmFormsHelper::setup_new_vars($values);
-            $id = FrmForm::create( $values );
-            $form = FrmForm::getOne($id);
+			$values = FrmFormsHelper::setup_new_vars($values);
+			$id = FrmForm::create( $values );
+			$form = FrmForm::getOne($id);
 
-            // add default email notification
-            $action_control = FrmFormActionsController::get_form_actions( 'email' );
-            $action_control->create($form->id);
+			// add default email notification
+			$action_control = FrmFormActionsController::get_form_actions( 'email' );
+			$action_control->create($form->id);
 
 			$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
-            $values['id'] = $id;
+			$values['id'] = $id;
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
-        }
-    }
+		}
+	}
 
 	public static function create( $values = array() ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check('frm_edit_forms');
 
-        global $frm_vars;
-        if ( empty( $values ) ) {
-            $values = $_POST;
-        }
+		global $frm_vars;
+		if ( empty( $values ) ) {
+			$values = $_POST;
+		}
 
-        //Set radio button and checkbox meta equal to "other" value
-        if ( FrmAppHelper::pro_is_installed() ) {
-            $values = FrmProEntry::mod_other_vals( $values, 'back' );
-        }
+		//Set radio button and checkbox meta equal to "other" value
+		if ( FrmAppHelper::pro_is_installed() ) {
+			$values = FrmProEntry::mod_other_vals( $values, 'back' );
+		}
 
 		$id = isset($values['id']) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
 
-        if ( ! current_user_can( 'frm_edit_forms' ) || ( $_POST && ( ! isset( $values['frm_save_form'] ) || ! wp_verify_nonce( $values['frm_save_form'], 'frm_save_form_nonce' ) ) ) ) {
-            $frm_settings = FrmAppHelper::get_settings();
-            $errors = array( 'form' => $frm_settings->admin_permission );
-        } else {
-            $errors = FrmForm::validate($values);
-        }
+		if ( ! current_user_can( 'frm_edit_forms' ) || ( $_POST && ( ! isset( $values['frm_save_form'] ) || ! wp_verify_nonce( $values['frm_save_form'], 'frm_save_form_nonce' ) ) ) ) {
+			$frm_settings = FrmAppHelper::get_settings();
+			$errors = array( 'form' => $frm_settings->admin_permission );
+		} else {
+			$errors = FrmForm::validate($values);
+		}
 
-        if ( count($errors) > 0 ) {
-            $hide_preview = true;
+		if ( count($errors) > 0 ) {
+			$hide_preview = true;
 			$frm_field_selection = FrmField::field_selection();
-            $form = FrmForm::getOne( $id );
-            $fields = FrmField::get_all_for_form($id);
+			$form = FrmForm::getOne( $id );
+			$fields = FrmField::get_all_for_form($id);
 
-            $values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
+			$values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
 			$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
-        } else {
-            FrmForm::update( $id, $values, true );
+		} else {
+			FrmForm::update( $id, $values, true );
 			$url = admin_url( 'admin.php?page=formidable&frm_action=settings&id=' . $id );
 			die( FrmAppHelper::js_redirect( $url ) );
-        }
-    }
+		}
+	}
 
-    public static function edit( $values = false ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+	public static function edit( $values = false ) {
+		FrmAppHelper::permission_check('frm_edit_forms');
 
 		$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
-        return self::get_edit_vars($id);
-    }
+		return self::get_edit_vars($id);
+	}
 
-    public static function settings( $id = false, $message = '' ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+	public static function settings( $id = false, $message = '' ) {
+		FrmAppHelper::permission_check('frm_edit_forms');
 
-        if ( ! $id || ! is_numeric($id) ) {
+		if ( ! $id || ! is_numeric($id) ) {
 			$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
-        }
+		}
 		return self::get_settings_vars( $id, array(), $message );
-    }
+	}
 
-    public static function update_settings() {
-        FrmAppHelper::permission_check('frm_edit_forms');
+	public static function update_settings() {
+		FrmAppHelper::permission_check('frm_edit_forms');
 
 		$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
 
-        $errors = FrmForm::validate($_POST);
-        if ( count($errors) > 0 ) {
-            return self::get_settings_vars($id, $errors);
-        }
+		$errors = FrmForm::validate($_POST);
+		if ( count($errors) > 0 ) {
+			return self::get_settings_vars($id, $errors);
+		}
 
-        do_action('frm_before_update_form_settings', $id);
+		do_action('frm_before_update_form_settings', $id);
 
 		FrmForm::update( $id, $_POST );
 
-        $message = __( 'Settings Successfully Updated', 'formidable' );
+		$message = __( 'Settings Successfully Updated', 'formidable' );
 		return self::get_settings_vars( $id, array(), $message );
-    }
+	}
 
 	public static function edit_key() {
 		$values = self::edit_in_place_value( 'form_key' );
@@ -175,43 +175,43 @@ 
 
 	public static function update( $values = array() ) {
 		if ( empty( $values ) ) {
-            $values = $_POST;
-        }
+			$values = $_POST;
+		}
 
-        //Set radio button and checkbox meta equal to "other" value
-        if ( FrmAppHelper::pro_is_installed() ) {
-            $values = FrmProEntry::mod_other_vals( $values, 'back' );
-        }
+		//Set radio button and checkbox meta equal to "other" value
+		if ( FrmAppHelper::pro_is_installed() ) {
+			$values = FrmProEntry::mod_other_vals( $values, 'back' );
+		}
 
-        $errors = FrmForm::validate( $values );
-        $permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
-        if ( $permission_error !== false ) {
-            $errors['form'] = $permission_error;
-        }
+		$errors = FrmForm::validate( $values );
+		$permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
+		if ( $permission_error !== false ) {
+			$errors['form'] = $permission_error;
+		}
 
 		$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
 
 		if ( count( $errors ) > 0 ) {
-            return self::get_edit_vars( $id, $errors );
+			return self::get_edit_vars( $id, $errors );
 		} else {
-            FrmForm::update( $id, $values );
-            $message = __( 'Form was Successfully Updated', 'formidable' );
-            if ( defined( 'DOING_AJAX' ) ) {
+			FrmForm::update( $id, $values );
+			$message = __( 'Form was Successfully Updated', 'formidable' );
+			if ( defined( 'DOING_AJAX' ) ) {
 				wp_die( $message );
-            }
+			}
 			return self::get_edit_vars( $id, array(), $message );
-        }
-    }
+		}
+	}
 
-    public static function bulk_create_template( $ids ) {
-        FrmAppHelper::permission_check( 'frm_edit_forms' );
+	public static function bulk_create_template( $ids ) {
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
 
-        foreach ( $ids as $id ) {
-            FrmForm::duplicate( $id, true, true );
-        }
+		foreach ( $ids as $id ) {
+			FrmForm::duplicate( $id, true, true );
+		}
 
-        return __( 'Form template was Successfully Created', 'formidable' );
-    }
+		return __( 'Form template was Successfully Created', 'formidable' );
+	}
 
 	/**
 	 * Redirect to the url for creating from a template
@@ -233,45 +233,45 @@ 
 		wp_die();
 	}
 
-    public static function duplicate() {
-        FrmAppHelper::permission_check('frm_edit_forms');
+	public static function duplicate() {
+		FrmAppHelper::permission_check('frm_edit_forms');
 
 		$params = FrmForm::list_page_params();
-        $form = FrmForm::duplicate( $params['id'], $params['template'], true );
-        $message = ($params['template']) ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' );
-        if ( $form ) {
+		$form = FrmForm::duplicate( $params['id'], $params['template'], true );
+		$message = ($params['template']) ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' );
+		if ( $form ) {
 			return self::get_edit_vars( $form, array(), $message, true );
-        } else {
-            return self::display_forms_list($params, __( 'There was a problem creating the new template.', 'formidable' ));
-        }
-    }
+		} else {
+			return self::display_forms_list($params, __( 'There was a problem creating the new template.', 'formidable' ));
+		}
+	}
 
-    public static function page_preview() {
+	public static function page_preview() {
 		$params = FrmForm::list_page_params();
-        if ( ! $params['form'] ) {
-            return;
-        }
-
-        $form = FrmForm::getOne( $params['form'] );
-        if ( ! $form ) {
-            return;
-        }
-        return self::show_form( $form->id, '', true, true );
-    }
-
-    public static function preview() {
-        do_action( 'frm_wp' );
-
-        global $frm_vars;
-        $frm_vars['preview'] = true;
-
-        if ( ! defined( 'ABSPATH' ) && ! defined( 'XMLRPC_REQUEST' ) ) {
-            global $wp;
-            $root = dirname( dirname( dirname( dirname( __FILE__ ) ) ) );
+		if ( ! $params['form'] ) {
+			return;
+		}
+
+		$form = FrmForm::getOne( $params['form'] );
+		if ( ! $form ) {
+			return;
+		}
+		return self::show_form( $form->id, '', true, true );
+	}
+
+	public static function preview() {
+		do_action( 'frm_wp' );
+
+		global $frm_vars;
+		$frm_vars['preview'] = true;
+
+		if ( ! defined( 'ABSPATH' ) && ! defined( 'XMLRPC_REQUEST' ) ) {
+			global $wp;
+			$root = dirname( dirname( dirname( dirname( __FILE__ ) ) ) );
 			include_once( $root . '/wp-config.php' );
-            $wp->init();
-            $wp->register_globals();
-        }
+			$wp->init();
+			$wp->register_globals();
+		}
 
 		self::register_pro_scripts();
 
@@ -285,11 +285,11 @@ 
 		$form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
 		if ( empty( $form ) ) {
 			$form = FrmForm::getAll( array(), '', 1 );
-        }
+		}
 
 		require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php' );
-        wp_die();
-    }
+		wp_die();
+	}
 
 	public static function register_pro_scripts() {
 		if ( FrmAppHelper::pro_is_installed() ) {
@@ -300,22 +300,22 @@ 
 		}
 	}
 
-    public static function untrash() {
+	public static function untrash() {
 		self::change_form_status( 'untrash' );
-    }
+	}
 
 	public static function bulk_untrash( $ids ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check('frm_edit_forms');
 
-        $count = FrmForm::set_status( $ids, 'published' );
+		$count = FrmForm::set_status( $ids, 'published' );
 
-        $message = sprintf(_n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
-        return $message;
-    }
+		$message = sprintf(_n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
+		return $message;
+	}
 
-    public static function trash() {
+	public static function trash() {
 		self::change_form_status( 'trash' );
-    }
+	}
 
 	/**
 	 * @param string $status
@@ -353,68 +353,68 @@ 
 	}
 
 	public static function bulk_trash( $ids ) {
-        FrmAppHelper::permission_check('frm_delete_forms');
+		FrmAppHelper::permission_check('frm_delete_forms');
 
-        $count = 0;
-        foreach ( $ids as $id ) {
-            if ( FrmForm::trash( $id ) ) {
-                $count++;
-            }
-        }
+		$count = 0;
+		foreach ( $ids as $id ) {
+			if ( FrmForm::trash( $id ) ) {
+				$count++;
+			}
+		}
 
-        $current_page = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
+		$current_page = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
 		$message = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=list&action=bulk_untrash&form_type=' . $current_page . '&item-action=' . implode( ',', $ids ), 'bulk-toplevel_page_formidable' ) ) . '">', '</a>' );
 
-        return $message;
-    }
+		return $message;
+	}
 
-    public static function destroy() {
-        FrmAppHelper::permission_check('frm_delete_forms');
+	public static function destroy() {
+		FrmAppHelper::permission_check('frm_delete_forms');
 
 		$params = FrmForm::list_page_params();
 
-        //check nonce url
-        check_admin_referer('destroy_form_' . $params['id']);
+		//check nonce url
+		check_admin_referer('destroy_form_' . $params['id']);
 
-        $count = 0;
-        if ( FrmForm::destroy( $params['id'] ) ) {
-            $count++;
-        }
+		$count = 0;
+		if ( FrmForm::destroy( $params['id'] ) ) {
+			$count++;
+		}
 
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+		$message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
 
 		self::display_forms_list( $params, $message );
-    }
+	}
 
 	public static function bulk_destroy( $ids ) {
-        FrmAppHelper::permission_check('frm_delete_forms');
+		FrmAppHelper::permission_check('frm_delete_forms');
 
-        $count = 0;
-        foreach ( $ids as $id ) {
-            $d = FrmForm::destroy( $id );
-            if ( $d ) {
-                $count++;
-            }
-        }
+		$count = 0;
+		foreach ( $ids as $id ) {
+			$d = FrmForm::destroy( $id );
+			if ( $d ) {
+				$count++;
+			}
+		}
 
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+		$message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
 
-        return $message;
-    }
+		return $message;
+	}
 
-    private static function delete_all() {
-        //check nonce url
-        $permission_error = FrmAppHelper::permission_nonce_error('frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable');
-        if ( $permission_error !== false ) {
+	private static function delete_all() {
+		//check nonce url
+		$permission_error = FrmAppHelper::permission_nonce_error('frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable');
+		if ( $permission_error !== false ) {
 			self::display_forms_list( array(), '', array( $permission_error ) );
-            return;
-        }
+			return;
+		}
 
 		$count = FrmForm::scheduled_delete( time() );
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+		$message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
 
 		self::display_forms_list( array(), $message );
-    }
+	}
 
 	public static function scheduled_delete( $delete_timestamp = '' ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmForm::scheduled_delete' );
@@ -422,11 +422,11 @@ 
 	}
 
 	/**
-	* Inserts Formidable button
-	* Hook exists since 2.5.0
-	*
-	* @since 2.0.15
-	*/
+	 * Inserts Formidable button
+	 * Hook exists since 2.5.0
+	 *
+	 * @since 2.0.15
+	 */
 	public static function insert_form_button() {
 		if ( current_user_can('frm_view_forms') ) {
 			$menu_name = FrmAppHelper::get_menu_name();
@@ -437,49 +437,49 @@ 
 		}
 	}
 
-    public static function insert_form_popup() {
+	public static function insert_form_popup() {
 		$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
 		if ( ! in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ) ) ) {
-            return;
-        }
+			return;
+		}
 
-        FrmAppHelper::load_admin_wide_js();
+		FrmAppHelper::load_admin_wide_js();
 
-        $shortcodes = array(
+		$shortcodes = array(
 			'formidable' => array( 'name' => __( 'Form', 'formidable' ), 'label' => __( 'Insert a Form', 'formidable' ) ),
-        );
+		);
 
-        $shortcodes = apply_filters('frm_popup_shortcodes', $shortcodes);
+		$shortcodes = apply_filters('frm_popup_shortcodes', $shortcodes);
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php' );
-    }
+	}
 
-    public static function get_shortcode_opts() {
+	public static function get_shortcode_opts() {
 		FrmAppHelper::permission_check('frm_view_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
-        if ( empty($shortcode) ) {
-            wp_die();
-        }
+		if ( empty($shortcode) ) {
+			wp_die();
+		}
 
 		echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
 		echo '<input type="radio" name="frmsc" value="' . esc_attr( $shortcode ) . '" id="sc-' . esc_attr( $shortcode ) . '" class="frm_hidden" />';
 
-        $form_id = '';
-        $opts = array();
+		$form_id = '';
+		$opts = array();
 		switch ( $shortcode ) {
-            case 'formidable':
-                $opts = array(
+			case 'formidable':
+				$opts = array(
 					'form_id'       => 'id',
-                    //'key' => ',
+					//'key' => ',
 					'title'         => array( 'val' => 1, 'label' => __( 'Display form title', 'formidable' ) ),
 					'description'   => array( 'val' => 1, 'label' => __( 'Display form description', 'formidable' ) ),
 					'minimize'      => array( 'val' => 1, 'label' => __( 'Minimize form HTML', 'formidable' ) ),
-                );
-            break;
-        }
-        $opts = apply_filters('frm_sc_popup_opts', $opts, $shortcode);
+				);
+			break;
+		}
+		$opts = apply_filters('frm_sc_popup_opts', $opts, $shortcode);
 
 		if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
 			// allow other shortcodes to use the required form id option
@@ -489,61 +489,61 @@ 
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php' );
 
-        echo '</div>';
+		echo '</div>';
 
-        wp_die();
-    }
+		wp_die();
+	}
 
 	public static function display_forms_list( $params = array(), $message = '', $errors = array(), $deprecated_errors = array() ) {
-        FrmAppHelper::permission_check( 'frm_view_forms' );
+		FrmAppHelper::permission_check( 'frm_view_forms' );
 		if ( ! empty( $deprecated_errors ) ) {
 			$errors = $deprecated_errors;
 			_deprecated_argument( 'errors', '2.0.8' );
 		}
 
-        global $wpdb, $frm_vars;
+		global $wpdb, $frm_vars;
 
 		if ( empty( $params ) ) {
 			$params = FrmForm::list_page_params();
-        }
+		}
 
-        $wp_list_table = new FrmFormsListHelper( compact( 'params' ) );
+		$wp_list_table = new FrmFormsListHelper( compact( 'params' ) );
 
-        $pagenum = $wp_list_table->get_pagenum();
+		$pagenum = $wp_list_table->get_pagenum();
 
-        $wp_list_table->prepare_items();
+		$wp_list_table->prepare_items();
 
-        $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-        if ( $pagenum > $total_pages && $total_pages > 0 ) {
+		$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
+		if ( $pagenum > $total_pages && $total_pages > 0 ) {
 			wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
-            die();
-        }
+			die();
+		}
 
 		require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php' );
-    }
+	}
 
 	public static function get_columns( $columns ) {
-	    $columns['cb'] = '<input type="checkbox" />';
-	    $columns['id'] = 'ID';
+		$columns['cb'] = '<input type="checkbox" />';
+		$columns['id'] = 'ID';
 
-        $type = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : 'published';
+		$type = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : 'published';
 
-        if ( 'template' == $type ) {
-            $columns['name']        = __( 'Template Name', 'formidable' );
-            $columns['type']        = __( 'Type', 'formidable' );
-            $columns['form_key']    = __( 'Key', 'formidable' );
-        } else {
-            $columns['name']        = __( 'Form Title', 'formidable' );
-            $columns['entries']     = __( 'Entries', 'formidable' );
-            $columns['form_key']    = __( 'Key', 'formidable' );
-            $columns['shortcode']   = __( 'Shortcodes', 'formidable' );
-        }
+		if ( 'template' == $type ) {
+			$columns['name']        = __( 'Template Name', 'formidable' );
+			$columns['type']        = __( 'Type', 'formidable' );
+			$columns['form_key']    = __( 'Key', 'formidable' );
+		} else {
+			$columns['name']        = __( 'Form Title', 'formidable' );
+			$columns['entries']     = __( 'Entries', 'formidable' );
+			$columns['form_key']    = __( 'Key', 'formidable' );
+			$columns['shortcode']   = __( 'Shortcodes', 'formidable' );
+		}
 
-        $columns['created_at'] = __( 'Date', 'formidable' );
+		$columns['created_at'] = __( 'Date', 'formidable' );
 
 		add_screen_option( 'per_page', array( 'label' => __( 'Forms', 'formidable' ), 'default' => 20, 'option' => 'formidable_page_formidable_per_page' ) );
 
-        return $columns;
+		return $columns;
 	}
 
 	public static function get_sortable_columns() {
@@ -557,111 +557,111 @@ 
 	}
 
 	public static function hidden_columns( $result ) {
-        $return = false;
-        foreach ( (array) $result as $r ) {
-            if ( ! empty( $r ) ) {
-                $return = true;
-                break;
-            }
-        }
+		$return = false;
+		foreach ( (array) $result as $r ) {
+			if ( ! empty( $r ) ) {
+				$return = true;
+				break;
+			}
+		}
 
-        if ( $return ) {
-            return $result;
+		if ( $return ) {
+			return $result;
 		}
 
-        $type = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
+		$type = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
 
-        $result[] = 'created_at';
-        if ( $type == 'template' ) {
-            $result[] = 'id';
-            $result[] = 'form_key';
-        }
+		$result[] = 'created_at';
+		if ( $type == 'template' ) {
+			$result[] = 'id';
+			$result[] = 'form_key';
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
 	public static function save_per_page( $save, $option, $value ) {
-        if ( $option == 'formidable_page_formidable_per_page' ) {
-            $save = (int) $value;
-        }
-        return $save;
-    }
+		if ( $option == 'formidable_page_formidable_per_page' ) {
+			$save = (int) $value;
+		}
+		return $save;
+	}
 
 	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
-        global $frm_vars;
+		global $frm_vars;
 
-        $form = FrmForm::getOne( $id );
-        if ( ! $form ) {
-            wp_die( __( 'You are trying to edit a form that does not exist.', 'formidable' ) );
-        }
+		$form = FrmForm::getOne( $id );
+		if ( ! $form ) {
+			wp_die( __( 'You are trying to edit a form that does not exist.', 'formidable' ) );
+		}
 
-        if ( $form->parent_form_id ) {
+		if ( $form->parent_form_id ) {
 			wp_die( sprintf( __( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form->parent_form_id ) ) . '">', '</a>' ));
-        }
+		}
 
 		$frm_field_selection = FrmField::field_selection();
-        $fields = FrmField::get_all_for_form($form->id);
+		$fields = FrmField::get_all_for_form($form->id);
 
-        // Automatically add end section fields if they don't exist (2.0 migration)
-        $reset_fields = false;
-        FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
+		// Automatically add end section fields if they don't exist (2.0 migration)
+		$reset_fields = false;
+		FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
 
-        if ( $reset_fields ) {
-            $fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
-        }
+		if ( $reset_fields ) {
+			$fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
+		}
 
-        unset($end_section_values, $last_order, $open, $reset_fields);
+		unset($end_section_values, $last_order, $open, $reset_fields);
 
 		$args = array( 'parent_form_id' => $form->id );
-        $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true, array(), $args );
+		$values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true, array(), $args );
 
-        $edit_message = __( 'Form was Successfully Updated', 'formidable' );
-        if ( $form->is_template && $message == $edit_message ) {
-            $message = __( 'Template was Successfully Updated', 'formidable' );
-        }
+		$edit_message = __( 'Form was Successfully Updated', 'formidable' );
+		if ( $form->is_template && $message == $edit_message ) {
+			$message = __( 'Template was Successfully Updated', 'formidable' );
+		}
 
 		$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
-        if ( $form->default_template ) {
-            wp_die(__( 'That template cannot be edited', 'formidable' ));
-        } else if ( defined('DOING_AJAX') ) {
-            wp_die();
-        } else if ( $create_link ) {
+		if ( $form->default_template ) {
+			wp_die(__( 'That template cannot be edited', 'formidable' ));
+		} else if ( defined('DOING_AJAX') ) {
+			wp_die();
+		} else if ( $create_link ) {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
-        } else {
+		} else {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' );
-        }
-    }
+		}
+	}
 
 	public static function get_settings_vars( $id, $errors = array(), $message = '' ) {
 		FrmAppHelper::permission_check( 'frm_edit_forms' );
 
-        global $frm_vars;
+		global $frm_vars;
 
-        $form = FrmForm::getOne( $id );
+		$form = FrmForm::getOne( $id );
 
-        $fields = FrmField::get_all_for_form($id);
-        $values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
+		$fields = FrmField::get_all_for_form($id);
+		$values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
 
-        if ( isset($values['default_template']) && $values['default_template'] ) {
-            wp_die(__( 'That template cannot be edited', 'formidable' ));
-        }
+		if ( isset($values['default_template']) && $values['default_template'] ) {
+			wp_die(__( 'That template cannot be edited', 'formidable' ));
+		}
 
-        $action_controls = FrmFormActionsController::get_form_actions();
+		$action_controls = FrmFormActionsController::get_form_actions();
 
-        $sections = apply_filters('frm_add_form_settings_section', array(), $values);
-        $pro_feature = FrmAppHelper::pro_is_installed() ? '' : ' class="pro_feature"';
+		$sections = apply_filters('frm_add_form_settings_section', array(), $values);
+		$pro_feature = FrmAppHelper::pro_is_installed() ? '' : ' class="pro_feature"';
 
-        $styles = apply_filters('frm_get_style_opts', array());
+		$styles = apply_filters('frm_get_style_opts', array());
 
 		require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
-    }
+	}
 
-    public static function mb_tags_box( $form_id, $class = '' ) {
-        $fields = FrmField::get_all_for_form($form_id, '', 'include');
-        $linked_forms = array();
-        $col = 'one';
-        $settings_tab = FrmAppHelper::is_admin_page('formidable' ) ? true : false;
+	public static function mb_tags_box( $form_id, $class = '' ) {
+		$fields = FrmField::get_all_for_form($form_id, '', 'include');
+		$linked_forms = array();
+		$col = 'one';
+		$settings_tab = FrmAppHelper::is_admin_page('formidable' ) ? true : false;
 
 		$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
 		$adv_shortcodes = self::get_advanced_shortcodes();
@@ -669,7 +669,7 @@ 
 		$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php' );
-    }
+	}
 
 	/**
 	 * Get an array of the options to display in the advanced tab
@@ -710,7 +710,7 @@ 
 			''          => '',
 			'siteurl'   => __( 'Site URL', 'formidable' ),
 			'sitename'  => __( 'Site Name', 'formidable' ),
-        );
+		);
 
 		if ( ! FrmAppHelper::pro_is_installed() ) {
 			unset( $entry_shortcodes['post_id'] );
@@ -737,39 +737,39 @@ 
 		return $entry_shortcodes;
 	}
 
-    // Insert the form class setting into the form
+	// Insert the form class setting into the form
 	public static function form_classes( $form ) {
-        if ( isset($form->options['form_class']) ) {
+		if ( isset($form->options['form_class']) ) {
 			echo esc_attr( sanitize_text_field( $form->options['form_class'] ) );
-        }
-    }
+		}
+	}
 
-    public static function get_email_html() {
+	public static function get_email_html() {
 		FrmAppHelper::permission_check('frm_view_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 		echo FrmEntryFormat::show_entry( array(
 			'form_id'       => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
-	        'default_email' => true,
+			'default_email' => true,
 			'plain_text'    => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ),
-	    ) );
-	    wp_die();
+		) );
+		wp_die();
 	}
 
-    public static function filter_content( $content, $form, $entry = false ) {
+	public static function filter_content( $content, $form, $entry = false ) {
 		self::get_entry_by_param( $entry );
-        if ( ! $entry ) {
-            return $content;
-        }
+		if ( ! $entry ) {
+			return $content;
+		}
 
-        if ( is_object( $form ) ) {
-            $form = $form->id;
-        }
+		if ( is_object( $form ) ) {
+			$form = $form->id;
+		}
 
-        $shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
-        $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
+		$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
+		$content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
 
-        return $content;
-    }
+		return $content;
+	}
 
 	private static function get_entry_by_param( &$entry ) {
 		if ( ! $entry || ! is_object( $entry ) ) {
@@ -781,287 +781,287 @@ 
 		}
 	}
 
-    public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
-        return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
-    }
+	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
+		return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
+	}
 
-    public static function process_bulk_form_actions( $errors ) {
-        if ( ! $_REQUEST ) {
-            return $errors;
-        }
+	public static function process_bulk_form_actions( $errors ) {
+		if ( ! $_REQUEST ) {
+			return $errors;
+		}
 
 		$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
-        if ( $bulkaction == -1 ) {
+		if ( $bulkaction == -1 ) {
 			$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
-        }
-
-        if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
-            FrmAppHelper::remove_get_action();
-
-            $bulkaction = str_replace( 'bulk_', '', $bulkaction );
-        }
-
-        $ids = FrmAppHelper::get_param( 'item-action', '' );
-        if ( empty( $ids ) ) {
-            $errors[] = __( 'No forms were specified', 'formidable' );
-            return $errors;
-        }
-
-        $permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
-        if ( $permission_error !== false ) {
-            $errors[] = $permission_error;
-            return $errors;
-        }
-
-        if ( ! is_array( $ids ) ) {
-            $ids = explode( ',', $ids );
-        }
-
-        switch ( $bulkaction ) {
-            case 'delete':
-                $message = self::bulk_destroy( $ids );
-            break;
-            case 'trash':
-                $message = self::bulk_trash( $ids );
-            break;
-            case 'untrash':
-                $message = self::bulk_untrash( $ids );
-            break;
-            case 'create_template':
-                $message = self::bulk_create_template( $ids );
-            break;
-        }
-
-        if ( isset( $message ) && ! empty( $message ) ) {
+		}
+
+		if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
+			FrmAppHelper::remove_get_action();
+
+			$bulkaction = str_replace( 'bulk_', '', $bulkaction );
+		}
+
+		$ids = FrmAppHelper::get_param( 'item-action', '' );
+		if ( empty( $ids ) ) {
+			$errors[] = __( 'No forms were specified', 'formidable' );
+			return $errors;
+		}
+
+		$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
+		if ( $permission_error !== false ) {
+			$errors[] = $permission_error;
+			return $errors;
+		}
+
+		if ( ! is_array( $ids ) ) {
+			$ids = explode( ',', $ids );
+		}
+
+		switch ( $bulkaction ) {
+			case 'delete':
+				$message = self::bulk_destroy( $ids );
+			break;
+			case 'trash':
+				$message = self::bulk_trash( $ids );
+			break;
+			case 'untrash':
+				$message = self::bulk_untrash( $ids );
+			break;
+			case 'create_template':
+				$message = self::bulk_create_template( $ids );
+			break;
+		}
+
+		if ( isset( $message ) && ! empty( $message ) ) {
 			echo '<div id="message" class="updated frm_msg_padding">' . FrmAppHelper::kses( $message, array( 'a' ) ) . '</div>';
-        }
+		}
 
-        return $errors;
-    }
+		return $errors;
+	}
 
-    public static function add_default_templates( $path, $default = true, $template = true ) {
-        _deprecated_function( __FUNCTION__, '1.07.05', 'FrmXMLController::add_default_templates()' );
+	public static function add_default_templates( $path, $default = true, $template = true ) {
+		_deprecated_function( __FUNCTION__, '1.07.05', 'FrmXMLController::add_default_templates()' );
 
-        $path = untrailingslashit(trim($path));
+		$path = untrailingslashit(trim($path));
 		$templates = glob( $path . '/*.php' );
 
 		for ( $i = count( $templates ) - 1; $i >= 0; $i-- ) {
 			$filename = str_replace( '.php', '', str_replace( $path . '/', '', $templates[ $i ] ) );
 			$template_query = array( 'form_key' => $filename );
-            if ( $template ) {
-                $template_query['is_template'] = 1;
-            }
-            if ( $default ) {
-                $template_query['default_template'] = 1;
-            }
+			if ( $template ) {
+				$template_query['is_template'] = 1;
+			}
+			if ( $default ) {
+				$template_query['default_template'] = 1;
+			}
 			$form = FrmForm::getAll( $template_query, '', 1 );
 
-            $values = FrmFormsHelper::setup_new_vars();
-            $values['form_key'] = $filename;
-            $values['is_template'] = $template;
-            $values['status'] = 'published';
-            if ( $default ) {
-                $values['default_template'] = 1;
-            }
-
-            include( $templates[ $i ] );
-
-            //get updated form
-            if ( isset($form) && ! empty($form) ) {
-                $old_id = $form->id;
-                $form = FrmForm::getOne($form->id);
-            } else {
-                $old_id = false;
+			$values = FrmFormsHelper::setup_new_vars();
+			$values['form_key'] = $filename;
+			$values['is_template'] = $template;
+			$values['status'] = 'published';
+			if ( $default ) {
+				$values['default_template'] = 1;
+			}
+
+			include( $templates[ $i ] );
+
+			//get updated form
+			if ( isset($form) && ! empty($form) ) {
+				$old_id = $form->id;
+				$form = FrmForm::getOne($form->id);
+			} else {
+				$old_id = false;
 				$form = FrmForm::getAll( $template_query, '', 1 );
-            }
+			}
 
-            if ( $form ) {
+			if ( $form ) {
 				do_action( 'frm_after_duplicate_form', $form->id, (array) $form, array( 'old_id' => $old_id ) );
-            }
-        }
-    }
+			}
+		}
+	}
 
-    public static function route() {
-        $action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
-        $vars = array();
+	public static function route() {
+		$action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
+		$vars = array();
 		if ( isset( $_POST['frm_compact_fields'] ) ) {
 			FrmAppHelper::permission_check( 'frm_edit_forms' );
 
-            $json_vars = htmlspecialchars_decode(nl2br(stripslashes(str_replace('&quot;', '\\\"', $_POST['frm_compact_fields'] ))));
-            $json_vars = json_decode($json_vars, true);
-            if ( empty($json_vars) ) {
-                // json decoding failed so we should return an error message
+			$json_vars = htmlspecialchars_decode(nl2br(stripslashes(str_replace('&quot;', '\\\"', $_POST['frm_compact_fields'] ))));
+			$json_vars = json_decode($json_vars, true);
+			if ( empty($json_vars) ) {
+				// json decoding failed so we should return an error message
 				$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
-                if ( 'edit' == $action ) {
-                    $action = 'update';
-                }
-
-                add_filter('frm_validate_form', 'FrmFormsController::json_error');
-            } else {
-                $vars = FrmAppHelper::json_to_array($json_vars);
-                $action = $vars[ $action ];
+				if ( 'edit' == $action ) {
+					$action = 'update';
+				}
+
+				add_filter('frm_validate_form', 'FrmFormsController::json_error');
+			} else {
+				$vars = FrmAppHelper::json_to_array($json_vars);
+				$action = $vars[ $action ];
 				unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] );
 				$_REQUEST = array_merge( $_REQUEST, $vars );
 				$_POST = array_merge( $_POST, $_REQUEST );
-            }
-        } else {
+			}
+		} else {
 			$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
-    		if ( isset( $_REQUEST['delete_all'] ) ) {
-                // override the action for this page
-    			$action = 'delete_all';
-            }
-        }
+			if ( isset( $_REQUEST['delete_all'] ) ) {
+				// override the action for this page
+				$action = 'delete_all';
+			}
+		}
 
 		add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
-        FrmAppHelper::trigger_hook_load( 'form' );
-
-        switch ( $action ) {
-            case 'new':
-                return self::new_form($vars);
-            case 'create':
-            case 'edit':
-            case 'update':
-            case 'duplicate':
-            case 'trash':
-            case 'untrash':
-            case 'destroy':
-            case 'delete_all':
-            case 'settings':
-            case 'update_settings':
+		FrmAppHelper::trigger_hook_load( 'form' );
+
+		switch ( $action ) {
+			case 'new':
+				return self::new_form($vars);
+			case 'create':
+			case 'edit':
+			case 'update':
+			case 'duplicate':
+			case 'trash':
+			case 'untrash':
+			case 'destroy':
+			case 'delete_all':
+			case 'settings':
+			case 'update_settings':
 				return self::$action( $vars );
-            default:
+			default:
 				do_action( 'frm_form_action_' . $action );
 				if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
-                    return;
-                }
+					return;
+				}
 
 				$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
-                if ( $action == -1 ) {
+				if ( $action == -1 ) {
 					$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
-                }
+				}
 
-                if ( strpos($action, 'bulk_') === 0 ) {
-                    FrmAppHelper::remove_get_action();
-                    return self::list_form();
-                }
+				if ( strpos($action, 'bulk_') === 0 ) {
+					FrmAppHelper::remove_get_action();
+					return self::list_form();
+				}
 
-                return self::display_forms_list();
-        }
-    }
+				return self::display_forms_list();
+		}
+	}
 
-    public static function json_error( $errors ) {
-        $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
-        return $errors;
-    }
+	public static function json_error( $errors ) {
+		$errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
+		return $errors;
+	}
 
 
-    /* FRONT-END FORMS */
-    public static function admin_bar_css() {
+	/* FRONT-END FORMS */
+	public static function admin_bar_css() {
 		if ( is_admin() || ! current_user_can( 'frm_edit_forms' ) ) {
-            return;
-        }
+			return;
+		}
 
 		add_action( 'wp_before_admin_bar_render', 'FrmFormsController::admin_bar_configure' );
 		FrmAppHelper::load_font_style();
 	}
 
 	public static function admin_bar_configure() {
-        global $frm_vars;
-        if ( empty($frm_vars['forms_loaded']) ) {
-            return;
-        }
-
-        $actions = array();
-        foreach ( $frm_vars['forms_loaded'] as $form ) {
-            if ( is_object($form) ) {
-                $actions[ $form->id ] = $form->name;
-            }
-            unset($form);
-        }
-
-        if ( empty($actions) ) {
-            return;
-        }
-
-        asort($actions);
-
-        global $wp_admin_bar;
-
-        if ( count($actions) == 1 ) {
-            $wp_admin_bar->add_menu( array(
-                'title' => 'Edit Form',
+		global $frm_vars;
+		if ( empty($frm_vars['forms_loaded']) ) {
+			return;
+		}
+
+		$actions = array();
+		foreach ( $frm_vars['forms_loaded'] as $form ) {
+			if ( is_object($form) ) {
+				$actions[ $form->id ] = $form->name;
+			}
+			unset($form);
+		}
+
+		if ( empty($actions) ) {
+			return;
+		}
+
+		asort($actions);
+
+		global $wp_admin_bar;
+
+		if ( count($actions) == 1 ) {
+			$wp_admin_bar->add_menu( array(
+				'title' => 'Edit Form',
 				'href'  => admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . current( array_keys( $actions ) ) ),
-                'id'    => 'frm-forms',
-            ) );
-        } else {
-            $wp_admin_bar->add_menu( array(
-        		'id'    => 'frm-forms',
-        		'title' => '<span class="ab-icon"></span><span class="ab-label">' . __( 'Edit Forms', 'formidable' ) . '</span>',
+				'id'    => 'frm-forms',
+			) );
+		} else {
+			$wp_admin_bar->add_menu( array(
+				'id'    => 'frm-forms',
+				'title' => '<span class="ab-icon"></span><span class="ab-label">' . __( 'Edit Forms', 'formidable' ) . '</span>',
 				'href'  => admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . current( array_keys( $actions ) ) ),
-        		'meta'  => array(
+				'meta'  => array(
 					'title' => __( 'Edit Forms', 'formidable' ),
-        		),
-        	) );
+				),
+			) );
 
-        	foreach ( $actions as $form_id => $name ) {
+			foreach ( $actions as $form_id => $name ) {
 
-        		$wp_admin_bar->add_menu( array(
-        			'parent'    => 'frm-forms',
+				$wp_admin_bar->add_menu( array(
+					'parent'    => 'frm-forms',
 					'id'        => 'edit_form_' . $form_id,
-        			'title'     => empty($name) ? __( '(no title)') : $name,
+					'title'     => empty($name) ? __( '(no title)') : $name,
 					'href'      => admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form_id ),
-        		) );
-        	}
-        }
-    }
+				) );
+			}
+		}
+	}
 
-    //formidable shortcode
+	//formidable shortcode
 	public static function get_form_shortcode( $atts ) {
-        global $frm_vars;
-        if ( isset($frm_vars['skip_shortcode']) && $frm_vars['skip_shortcode'] ) {
-            $sc = '[formidable';
+		global $frm_vars;
+		if ( isset($frm_vars['skip_shortcode']) && $frm_vars['skip_shortcode'] ) {
+			$sc = '[formidable';
 			if ( ! empty( $atts ) ) {
 				foreach ( $atts as $k => $v ) {
 					$sc .= ' ' . $k . '="' . esc_attr( $v ) . '"';
 				}
 			}
 			return $sc . ']';
-        }
-
-        $shortcode_atts = shortcode_atts( array(
-            'id' => '', 'key' => '', 'title' => false, 'description' => false,
-            'readonly' => false, 'entry_id' => false, 'fields' => array(),
-            'exclude_fields' => array(), 'minimize' => false,
-        ), $atts);
-        do_action('formidable_shortcode_atts', $shortcode_atts, $atts);
-
-        return self::show_form(
-            $shortcode_atts['id'], $shortcode_atts['key'], $shortcode_atts['title'],
-            $shortcode_atts['description'], $atts
-        );
-    }
-
-    public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
-        if ( empty( $id ) ) {
-            $id = $key;
-        }
-
-        // no form id or key set
-        if ( empty( $id ) ) {
-            return __( 'Please select a valid form', 'formidable' );
-        }
-
-        $form = FrmForm::getOne( $id );
-        if ( ! $form || $form->parent_form_id || $form->status == 'trash' ) {
-            return __( 'Please select a valid form', 'formidable' );
-        }
+		}
+
+		$shortcode_atts = shortcode_atts( array(
+			'id' => '', 'key' => '', 'title' => false, 'description' => false,
+			'readonly' => false, 'entry_id' => false, 'fields' => array(),
+			'exclude_fields' => array(), 'minimize' => false,
+		), $atts);
+		do_action('formidable_shortcode_atts', $shortcode_atts, $atts);
+
+		return self::show_form(
+			$shortcode_atts['id'], $shortcode_atts['key'], $shortcode_atts['title'],
+			$shortcode_atts['description'], $atts
+		);
+	}
+
+	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
+		if ( empty( $id ) ) {
+			$id = $key;
+		}
+
+		// no form id or key set
+		if ( empty( $id ) ) {
+			return __( 'Please select a valid form', 'formidable' );
+		}
+
+		$form = FrmForm::getOne( $id );
+		if ( ! $form || $form->parent_form_id || $form->status == 'trash' ) {
+			return __( 'Please select a valid form', 'formidable' );
+		}
 
 		add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
-        FrmAppHelper::trigger_hook_load( 'form', $form );
+		FrmAppHelper::trigger_hook_load( 'form', $form );
 
-        $form = apply_filters( 'frm_pre_display_form', $form );
+		$form = apply_filters( 'frm_pre_display_form', $form );
 
-        $frm_settings = FrmAppHelper::get_settings();
+		$frm_settings = FrmAppHelper::get_settings();
 
 		if ( self::is_viewable_draft_form( $form ) ) {
 			// don't show a draft form on a page
@@ -1082,7 +1082,7 @@ 
 		}
 
 		return $form;
-    }
+	}
 
 	private static function is_viewable_draft_form( $form ) {
 		global $post;
@@ -1098,98 +1098,98 @@ 
 		return $form->logged_in && get_current_user_id() && isset( $form->options['logged_in_role'] ) && $form->options['logged_in_role'] != '' && ! FrmAppHelper::user_has_permission( $form->options['logged_in_role'] );
 	}
 
-    public static function get_form( $form, $title, $description, $atts = array() ) {
-        ob_start();
+	public static function get_form( $form, $title, $description, $atts = array() ) {
+		ob_start();
 
-        self::get_form_contents( $form, $title, $description, $atts );
+		self::get_form_contents( $form, $title, $description, $atts );
 		self::enqueue_scripts( FrmForm::get_params( $form ) );
 
-        $contents = ob_get_contents();
-        ob_end_clean();
+		$contents = ob_get_contents();
+		ob_end_clean();
 
 		self::maybe_minimize_form( $atts, $contents );
 
-        return $contents;
-    }
+		return $contents;
+	}
 
 	public static function enqueue_scripts( $params ) {
 		do_action( 'frm_enqueue_form_scripts', $params );
 	}
 
 	public static function get_form_contents( $form, $title, $description, $atts ) {
-        global $frm_vars;
+		global $frm_vars;
 
-        $frm_settings = FrmAppHelper::get_settings();
+		$frm_settings = FrmAppHelper::get_settings();
 
-        $submit = isset($form->options['submit_value']) ? $form->options['submit_value'] : $frm_settings->submit_value;
+		$submit = isset($form->options['submit_value']) ? $form->options['submit_value'] : $frm_settings->submit_value;
 
-        $user_ID = get_current_user_id();
+		$user_ID = get_current_user_id();
 		$params = FrmForm::get_params( $form );
-        $message = $errors = '';
+		$message = $errors = '';
 
-        if ( $params['posted_form_id'] == $form->id && $_POST ) {
-            $errors = isset( $frm_vars['created_entries'][ $form->id ] ) ? $frm_vars['created_entries'][ $form->id ]['errors'] : array();
-        }
+		if ( $params['posted_form_id'] == $form->id && $_POST ) {
+			$errors = isset( $frm_vars['created_entries'][ $form->id ] ) ? $frm_vars['created_entries'][ $form->id ]['errors'] : array();
+		}
 
 		$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
-        $fields = FrmFieldsHelper::get_form_fields( $form->id, ( isset( $errors ) && ! empty( $errors ) ) );
+		$fields = FrmFieldsHelper::get_form_fields( $form->id, ( isset( $errors ) && ! empty( $errors ) ) );
 
-        if ( $params['action'] != 'create' || $params['posted_form_id'] != $form->id || ! $_POST ) {
-            do_action('frm_display_form_action', $params, $fields, $form, $title, $description);
-            if ( apply_filters('frm_continue_to_new', true, $form->id, $params['action']) ) {
-                $values = FrmEntriesHelper::setup_new_vars($fields, $form);
+		if ( $params['action'] != 'create' || $params['posted_form_id'] != $form->id || ! $_POST ) {
+			do_action('frm_display_form_action', $params, $fields, $form, $title, $description);
+			if ( apply_filters('frm_continue_to_new', true, $form->id, $params['action']) ) {
+				$values = FrmEntriesHelper::setup_new_vars($fields, $form);
 				include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
-            }
-            return;
-        }
+			}
+			return;
+		}
 
-        if ( ! empty($errors) ) {
-            $values = $fields ? FrmEntriesHelper::setup_new_vars($fields, $form) : array();
+		if ( ! empty($errors) ) {
+			$values = $fields ? FrmEntriesHelper::setup_new_vars($fields, $form) : array();
 			include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
-            return;
-        }
+			return;
+		}
 
-        do_action('frm_validate_form_creation', $params, $fields, $form, $title, $description);
-        if ( ! apply_filters('frm_continue_to_create', true, $form->id) ) {
-            return;
-        }
+		do_action('frm_validate_form_creation', $params, $fields, $form, $title, $description);
+		if ( ! apply_filters('frm_continue_to_create', true, $form->id) ) {
+			return;
+		}
 
-        $values = FrmEntriesHelper::setup_new_vars($fields, $form, true);
-        $created = ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form->id ] ) ) ? $frm_vars['created_entries'][ $form->id ]['entry_id'] : 0;
-        $conf_method = apply_filters('frm_success_filter', 'message', $form, $form->options, 'create');
+		$values = FrmEntriesHelper::setup_new_vars($fields, $form, true);
+		$created = ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form->id ] ) ) ? $frm_vars['created_entries'][ $form->id ]['entry_id'] : 0;
+		$conf_method = apply_filters('frm_success_filter', 'message', $form, $form->options, 'create');
 
-        if ( $created && is_numeric($created) && $conf_method != 'message' ) {
-            do_action('frm_success_action', $conf_method, $form, $form->options, $created);
+		if ( $created && is_numeric($created) && $conf_method != 'message' ) {
+			do_action('frm_success_action', $conf_method, $form, $form->options, $created);
 			do_action( 'frm_after_entry_processed', array( 'entry_id' => $created, 'form' => $form ) );
-            return;
-        }
+			return;
+		}
 
-        if ( $created && is_numeric($created) ) {
-            $message = isset($form->options['success_msg']) ? $form->options['success_msg'] : $frm_settings->success_msg;
-            $class = 'frm_message';
-        } else {
-            $message = $frm_settings->failed_msg;
-            $class = 'frm_error_style';
-        }
+		if ( $created && is_numeric($created) ) {
+			$message = isset($form->options['success_msg']) ? $form->options['success_msg'] : $frm_settings->success_msg;
+			$class = 'frm_message';
+		} else {
+			$message = $frm_settings->failed_msg;
+			$class = 'frm_error_style';
+		}
 
 		$message = FrmFormsHelper::get_success_message( array(
 			'message' => $message, 'form' => $form,
 			'entry_id' => $created, 'class' => $class,
 		) );
-        $message = apply_filters('frm_main_feedback', $message, $form, $created);
+		$message = apply_filters('frm_main_feedback', $message, $form, $created);
 
-        if ( ! isset($form->options['show_form']) || $form->options['show_form'] ) {
+		if ( ! isset($form->options['show_form']) || $form->options['show_form'] ) {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
-        } else {
-            global $frm_vars;
+		} else {
+			global $frm_vars;
 			self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
 
 			$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
 			include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php' );
-        }
+		}
 
 		do_action( 'frm_after_entry_processed', array( 'entry_id' => $created, 'form' => $form ) );
-    }
+	}
 
 	public static function front_head() {
 		$version = FrmAppHelper::plugin_version();
@@ -1218,10 +1218,10 @@ 
 	}
 
 	public static function defer_script_loading( $tag, $handle ) {
-	    if ( 'recaptcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
-	        $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
+		if ( 'recaptcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
+			$tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
 		}
-	    return $tag;
+		return $tag;
 	}
 
 	public static function footer_js( $location = 'footer' ) {

Spacing +120 added lines, -120 removed lines

@@ -7,7 +7,7 @@ 
 		if ( ! FrmAppHelper::pro_is_installed() ) {
 			$menu_label .= ' (Lite)';
 		}
-		add_submenu_page('formidable', 'Formidable | ' . $menu_label, $menu_label, 'frm_view_forms', 'formidable', 'FrmFormsController::route' );
+		add_submenu_page( 'formidable', 'Formidable | ' . $menu_label, $menu_label, 'frm_view_forms', 'formidable', 'FrmFormsController::route' );
 
 		self::maybe_load_listing_hooks();
     }
@@ -18,14 +18,14 @@ 
 			return;
 		}
 
-		add_filter('get_user_option_managetoplevel_page_formidablecolumnshidden', 'FrmFormsController::hidden_columns' );
+		add_filter( 'get_user_option_managetoplevel_page_formidablecolumnshidden', 'FrmFormsController::hidden_columns' );
 
-		add_filter('manage_toplevel_page_formidable_columns', 'FrmFormsController::get_columns', 0 );
-		add_filter('manage_toplevel_page_formidable_sortable_columns', 'FrmFormsController::get_sortable_columns' );
+		add_filter( 'manage_toplevel_page_formidable_columns', 'FrmFormsController::get_columns', 0 );
+		add_filter( 'manage_toplevel_page_formidable_sortable_columns', 'FrmFormsController::get_sortable_columns' );
 	}
 
     public static function head() {
-        wp_enqueue_script('formidable-editinplace');
+        wp_enqueue_script( 'formidable-editinplace' );
 
         if ( wp_is_mobile() ) {
     		wp_enqueue_script( 'jquery-touch-punch' );
@@ -33,39 +33,39 @@ 
     }
 
     public static function register_widgets() {
-        require_once(FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php');
-        register_widget('FrmShowForm');
+        require_once( FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php' );
+        register_widget( 'FrmShowForm' );
     }
 
     public static function list_form() {
-        FrmAppHelper::permission_check('frm_view_forms');
+        FrmAppHelper::permission_check( 'frm_view_forms' );
 
 		$params = FrmForm::list_page_params();
-        $errors = self::process_bulk_form_actions( array());
-        $errors = apply_filters('frm_admin_list_form_action', $errors);
+        $errors = self::process_bulk_form_actions( array() );
+        $errors = apply_filters( 'frm_admin_list_form_action', $errors );
 
 		return self::display_forms_list( $params, '', $errors );
     }
 
 	public static function new_form( $values = array() ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
         global $frm_vars;
 
-        $action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
-		$action = empty( $values ) ? FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' ) : $values[ $action ];
+        $action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
+		$action = empty( $values ) ? FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' ) : $values[$action];
 
 		if ( $action == 'create' ) {
-            return self::create($values);
+            return self::create( $values );
 		} else if ( $action == 'new' ) {
 			$frm_field_selection = FrmField::field_selection();
-            $values = FrmFormsHelper::setup_new_vars($values);
+            $values = FrmFormsHelper::setup_new_vars( $values );
             $id = FrmForm::create( $values );
-            $form = FrmForm::getOne($id);
+            $form = FrmForm::getOne( $id );
 
             // add default email notification
             $action_control = FrmFormActionsController::get_form_actions( 'email' );
-            $action_control->create($form->id);
+            $action_control->create( $form->id );
 
 			$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
@@ -75,7 +75,7 @@ 
     }
 
 	public static function create( $values = array() ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
         global $frm_vars;
         if ( empty( $values ) ) {
@@ -87,22 +87,22 @@ 
             $values = FrmProEntry::mod_other_vals( $values, 'back' );
         }
 
-		$id = isset($values['id']) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
+		$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
 
         if ( ! current_user_can( 'frm_edit_forms' ) || ( $_POST && ( ! isset( $values['frm_save_form'] ) || ! wp_verify_nonce( $values['frm_save_form'], 'frm_save_form_nonce' ) ) ) ) {
             $frm_settings = FrmAppHelper::get_settings();
             $errors = array( 'form' => $frm_settings->admin_permission );
         } else {
-            $errors = FrmForm::validate($values);
+            $errors = FrmForm::validate( $values );
         }
 
-        if ( count($errors) > 0 ) {
+        if ( count( $errors ) > 0 ) {
             $hide_preview = true;
 			$frm_field_selection = FrmField::field_selection();
             $form = FrmForm::getOne( $id );
-            $fields = FrmField::get_all_for_form($id);
+            $fields = FrmField::get_all_for_form( $id );
 
-            $values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
+            $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
 			$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
@@ -114,32 +114,32 @@ 
     }
 
     public static function edit( $values = false ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
 		$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
-        return self::get_edit_vars($id);
+        return self::get_edit_vars( $id );
     }
 
     public static function settings( $id = false, $message = '' ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
-        if ( ! $id || ! is_numeric($id) ) {
+        if ( ! $id || ! is_numeric( $id ) ) {
 			$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
         }
 		return self::get_settings_vars( $id, array(), $message );
     }
 
     public static function update_settings() {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
 		$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
 
-        $errors = FrmForm::validate($_POST);
-        if ( count($errors) > 0 ) {
-            return self::get_settings_vars($id, $errors);
+        $errors = FrmForm::validate( $_POST );
+        if ( count( $errors ) > 0 ) {
+            return self::get_settings_vars( $id, $errors );
         }
 
-        do_action('frm_before_update_form_settings', $id);
+        do_action( 'frm_before_update_form_settings', $id );
 
 		FrmForm::update( $id, $_POST );
 
@@ -161,7 +161,7 @@ 
 
 	private static function edit_in_place_value( $field ) {
 		check_ajax_referer( 'frm_ajax', 'nonce' );
-		FrmAppHelper::permission_check('frm_edit_forms', 'hide');
+		FrmAppHelper::permission_check( 'frm_edit_forms', 'hide' );
 
 		$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
 		$value = FrmAppHelper::get_post_param( 'update_value', '', 'wp_filter_post_kses' );
@@ -219,7 +219,7 @@ 
 	 * @since 2.0
 	 */
 	public static function _create_from_template() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
 		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$current_form = FrmAppHelper::get_param( 'this_form', '', 'get', 'absint' );
@@ -234,15 +234,15 @@ 
 	}
 
     public static function duplicate() {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
 		$params = FrmForm::list_page_params();
         $form = FrmForm::duplicate( $params['id'], $params['template'], true );
-        $message = ($params['template']) ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' );
+        $message = ( $params['template'] ) ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' );
         if ( $form ) {
 			return self::get_edit_vars( $form, array(), $message, true );
         } else {
-            return self::display_forms_list($params, __( 'There was a problem creating the new template.', 'formidable' ));
+            return self::display_forms_list( $params, __( 'There was a problem creating the new template.', 'formidable' ) );
         }
     }
 
@@ -305,11 +305,11 @@ 
     }
 
 	public static function bulk_untrash( $ids ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
         $count = FrmForm::set_status( $ids, 'published' );
 
-        $message = sprintf(_n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
+        $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
         return $message;
     }
 
@@ -328,11 +328,11 @@ 
 			'trash'   => array( 'permission' => 'frm_delete_forms', 'new_status' => 'trash' ),
 		);
 
-		if ( ! isset( $available_status[ $status ] ) ) {
+		if ( ! isset( $available_status[$status] ) ) {
 			return;
 		}
 
-		FrmAppHelper::permission_check( $available_status[ $status ]['permission'] );
+		FrmAppHelper::permission_check( $available_status[$status]['permission'] );
 
 		$params = FrmForm::list_page_params();
 
@@ -340,25 +340,25 @@ 
 		check_admin_referer( $status . '_form_' . $params['id'] );
 
 		$count = 0;
-		if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
-			$count++;
+		if ( FrmForm::set_status( $params['id'], $available_status[$status]['new_status'] ) ) {
+			$count ++;
 		}
 
-		$available_status['untrash']['message'] = sprintf(_n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
+		$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
 		$available_status['trash']['message'] = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . ( isset( $_REQUEST['form_type'] ) ? sanitize_title( $_REQUEST['form_type'] ) : '' ) . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' );
 
-		$message = $available_status[ $status ]['message'];
+		$message = $available_status[$status]['message'];
 
 		self::display_forms_list( $params, $message );
 	}
 
 	public static function bulk_trash( $ids ) {
-        FrmAppHelper::permission_check('frm_delete_forms');
+        FrmAppHelper::permission_check( 'frm_delete_forms' );
 
         $count = 0;
         foreach ( $ids as $id ) {
             if ( FrmForm::trash( $id ) ) {
-                $count++;
+                $count ++;
             }
         }
 
@@ -369,49 +369,49 @@ 
     }
 
     public static function destroy() {
-        FrmAppHelper::permission_check('frm_delete_forms');
+        FrmAppHelper::permission_check( 'frm_delete_forms' );
 
 		$params = FrmForm::list_page_params();
 
         //check nonce url
-        check_admin_referer('destroy_form_' . $params['id']);
+        check_admin_referer( 'destroy_form_' . $params['id'] );
 
         $count = 0;
         if ( FrmForm::destroy( $params['id'] ) ) {
-            $count++;
+            $count ++;
         }
 
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+        $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
 
 		self::display_forms_list( $params, $message );
     }
 
 	public static function bulk_destroy( $ids ) {
-        FrmAppHelper::permission_check('frm_delete_forms');
+        FrmAppHelper::permission_check( 'frm_delete_forms' );
 
         $count = 0;
         foreach ( $ids as $id ) {
             $d = FrmForm::destroy( $id );
             if ( $d ) {
-                $count++;
+                $count ++;
             }
         }
 
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+        $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
 
         return $message;
     }
 
     private static function delete_all() {
         //check nonce url
-        $permission_error = FrmAppHelper::permission_nonce_error('frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable');
+        $permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
         if ( $permission_error !== false ) {
 			self::display_forms_list( array(), '', array( $permission_error ) );
             return;
         }
 
 		$count = FrmForm::scheduled_delete( time() );
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+        $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
 
 		self::display_forms_list( array(), $message );
     }
@@ -428,7 +428,7 @@ 
 	* @since 2.0.15
 	*/
 	public static function insert_form_button() {
-		if ( current_user_can('frm_view_forms') ) {
+		if ( current_user_can( 'frm_view_forms' ) ) {
 			$menu_name = FrmAppHelper::get_menu_name();
 			$content = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">
 				<span class="frm-buttons-icon wp-media-buttons-icon"></span> ' .
@@ -449,17 +449,17 @@ 
 			'formidable' => array( 'name' => __( 'Form', 'formidable' ), 'label' => __( 'Insert a Form', 'formidable' ) ),
         );
 
-        $shortcodes = apply_filters('frm_popup_shortcodes', $shortcodes);
+        $shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php' );
     }
 
     public static function get_shortcode_opts() {
-		FrmAppHelper::permission_check('frm_view_forms');
+		FrmAppHelper::permission_check( 'frm_view_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
-        if ( empty($shortcode) ) {
+        if ( empty( $shortcode ) ) {
             wp_die();
         }
 
@@ -479,7 +479,7 @@ 
                 );
             break;
         }
-        $opts = apply_filters('frm_sc_popup_opts', $opts, $shortcode);
+        $opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
 
 		if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
 			// allow other shortcodes to use the required form id option
@@ -596,11 +596,11 @@ 
         }
 
         if ( $form->parent_form_id ) {
-			wp_die( sprintf( __( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form->parent_form_id ) ) . '">', '</a>' ));
+			wp_die( sprintf( __( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form->parent_form_id ) ) . '">', '</a>' ) );
         }
 
 		$frm_field_selection = FrmField::field_selection();
-        $fields = FrmField::get_all_for_form($form->id);
+        $fields = FrmField::get_all_for_form( $form->id );
 
         // Automatically add end section fields if they don't exist (2.0 migration)
         $reset_fields = false;
@@ -610,7 +610,7 @@ 
             $fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
         }
 
-        unset($end_section_values, $last_order, $open, $reset_fields);
+        unset( $end_section_values, $last_order, $open, $reset_fields );
 
 		$args = array( 'parent_form_id' => $form->id );
         $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true, array(), $args );
@@ -623,8 +623,8 @@ 
 		$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
         if ( $form->default_template ) {
-            wp_die(__( 'That template cannot be edited', 'formidable' ));
-        } else if ( defined('DOING_AJAX') ) {
+            wp_die( __( 'That template cannot be edited', 'formidable' ) );
+        } else if ( defined( 'DOING_AJAX' ) ) {
             wp_die();
         } else if ( $create_link ) {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
@@ -640,28 +640,28 @@ 
 
         $form = FrmForm::getOne( $id );
 
-        $fields = FrmField::get_all_for_form($id);
-        $values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
+        $fields = FrmField::get_all_for_form( $id );
+        $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
 
-        if ( isset($values['default_template']) && $values['default_template'] ) {
-            wp_die(__( 'That template cannot be edited', 'formidable' ));
+        if ( isset( $values['default_template'] ) && $values['default_template'] ) {
+            wp_die( __( 'That template cannot be edited', 'formidable' ) );
         }
 
         $action_controls = FrmFormActionsController::get_form_actions();
 
-        $sections = apply_filters('frm_add_form_settings_section', array(), $values);
+        $sections = apply_filters( 'frm_add_form_settings_section', array(), $values );
         $pro_feature = FrmAppHelper::pro_is_installed() ? '' : ' class="pro_feature"';
 
-        $styles = apply_filters('frm_get_style_opts', array());
+        $styles = apply_filters( 'frm_get_style_opts', array() );
 
 		require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
     }
 
     public static function mb_tags_box( $form_id, $class = '' ) {
-        $fields = FrmField::get_all_for_form($form_id, '', 'include');
+        $fields = FrmField::get_all_for_form( $form_id, '', 'include' );
         $linked_forms = array();
         $col = 'one';
-        $settings_tab = FrmAppHelper::is_admin_page('formidable' ) ? true : false;
+        $settings_tab = FrmAppHelper::is_admin_page( 'formidable' ) ? true : false;
 
 		$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
 		$adv_shortcodes = self::get_advanced_shortcodes();
@@ -739,13 +739,13 @@ 
 
     // Insert the form class setting into the form
 	public static function form_classes( $form ) {
-        if ( isset($form->options['form_class']) ) {
+        if ( isset( $form->options['form_class'] ) ) {
 			echo esc_attr( sanitize_text_field( $form->options['form_class'] ) );
         }
     }
 
     public static function get_email_html() {
-		FrmAppHelper::permission_check('frm_view_forms');
+		FrmAppHelper::permission_check( 'frm_view_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 		echo FrmEntryFormat::show_entry( array(
 			'form_id'       => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
@@ -842,11 +842,11 @@ 
     public static function add_default_templates( $path, $default = true, $template = true ) {
         _deprecated_function( __FUNCTION__, '1.07.05', 'FrmXMLController::add_default_templates()' );
 
-        $path = untrailingslashit(trim($path));
+        $path = untrailingslashit( trim( $path ) );
 		$templates = glob( $path . '/*.php' );
 
-		for ( $i = count( $templates ) - 1; $i >= 0; $i-- ) {
-			$filename = str_replace( '.php', '', str_replace( $path . '/', '', $templates[ $i ] ) );
+		for ( $i = count( $templates ) - 1; $i >= 0; $i -- ) {
+			$filename = str_replace( '.php', '', str_replace( $path . '/', '', $templates[$i] ) );
 			$template_query = array( 'form_key' => $filename );
             if ( $template ) {
                 $template_query['is_template'] = 1;
@@ -864,12 +864,12 @@ 
                 $values['default_template'] = 1;
             }
 
-            include( $templates[ $i ] );
+            include( $templates[$i] );
 
             //get updated form
-            if ( isset($form) && ! empty($form) ) {
+            if ( isset( $form ) && ! empty( $form ) ) {
                 $old_id = $form->id;
-                $form = FrmForm::getOne($form->id);
+                $form = FrmForm::getOne( $form->id );
             } else {
                 $old_id = false;
 				$form = FrmForm::getAll( $template_query, '', 1 );
@@ -882,24 +882,24 @@ 
     }
 
     public static function route() {
-        $action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
+        $action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
         $vars = array();
 		if ( isset( $_POST['frm_compact_fields'] ) ) {
 			FrmAppHelper::permission_check( 'frm_edit_forms' );
 
-            $json_vars = htmlspecialchars_decode(nl2br(stripslashes(str_replace('&quot;', '\\\"', $_POST['frm_compact_fields'] ))));
-            $json_vars = json_decode($json_vars, true);
-            if ( empty($json_vars) ) {
+            $json_vars = htmlspecialchars_decode( nl2br( stripslashes( str_replace( '&quot;', '\\\"', $_POST['frm_compact_fields'] ) ) ) );
+            $json_vars = json_decode( $json_vars, true );
+            if ( empty( $json_vars ) ) {
                 // json decoding failed so we should return an error message
 				$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
                 if ( 'edit' == $action ) {
                     $action = 'update';
                 }
 
-                add_filter('frm_validate_form', 'FrmFormsController::json_error');
+                add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
             } else {
-                $vars = FrmAppHelper::json_to_array($json_vars);
-                $action = $vars[ $action ];
+                $vars = FrmAppHelper::json_to_array( $json_vars );
+                $action = $vars[$action];
 				unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] );
 				$_REQUEST = array_merge( $_REQUEST, $vars );
 				$_POST = array_merge( $_POST, $_REQUEST );
@@ -917,7 +917,7 @@ 
 
         switch ( $action ) {
             case 'new':
-                return self::new_form($vars);
+                return self::new_form( $vars );
             case 'create':
             case 'edit':
             case 'update':
@@ -940,7 +940,7 @@ 
 					$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
                 }
 
-                if ( strpos($action, 'bulk_') === 0 ) {
+                if ( strpos( $action, 'bulk_' ) === 0 ) {
                     FrmAppHelper::remove_get_action();
                     return self::list_form();
                 }
@@ -967,27 +967,27 @@ 
 
 	public static function admin_bar_configure() {
         global $frm_vars;
-        if ( empty($frm_vars['forms_loaded']) ) {
+        if ( empty( $frm_vars['forms_loaded'] ) ) {
             return;
         }
 
         $actions = array();
         foreach ( $frm_vars['forms_loaded'] as $form ) {
-            if ( is_object($form) ) {
-                $actions[ $form->id ] = $form->name;
+            if ( is_object( $form ) ) {
+                $actions[$form->id] = $form->name;
             }
-            unset($form);
+            unset( $form );
         }
 
-        if ( empty($actions) ) {
+        if ( empty( $actions ) ) {
             return;
         }
 
-        asort($actions);
+        asort( $actions );
 
         global $wp_admin_bar;
 
-        if ( count($actions) == 1 ) {
+        if ( count( $actions ) == 1 ) {
             $wp_admin_bar->add_menu( array(
                 'title' => 'Edit Form',
 				'href'  => admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . current( array_keys( $actions ) ) ),
@@ -1008,7 +1008,7 @@ 
         		$wp_admin_bar->add_menu( array(
         			'parent'    => 'frm-forms',
 					'id'        => 'edit_form_' . $form_id,
-        			'title'     => empty($name) ? __( '(no title)') : $name,
+        			'title'     => empty( $name ) ? __( '(no title)' ) : $name,
 					'href'      => admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form_id ),
         		) );
         	}
@@ -1018,7 +1018,7 @@ 
     //formidable shortcode
 	public static function get_form_shortcode( $atts ) {
         global $frm_vars;
-        if ( isset($frm_vars['skip_shortcode']) && $frm_vars['skip_shortcode'] ) {
+        if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) {
             $sc = '[formidable';
 			if ( ! empty( $atts ) ) {
 				foreach ( $atts as $k => $v ) {
@@ -1032,8 +1032,8 @@ 
             'id' => '', 'key' => '', 'title' => false, 'description' => false,
             'readonly' => false, 'entry_id' => false, 'fields' => array(),
             'exclude_fields' => array(), 'minimize' => false,
-        ), $atts);
-        do_action('formidable_shortcode_atts', $shortcode_atts, $atts);
+        ), $atts );
+        do_action( 'formidable_shortcode_atts', $shortcode_atts, $atts );
 
         return self::show_form(
             $shortcode_atts['id'], $shortcode_atts['key'], $shortcode_atts['title'],
@@ -1121,51 +1121,51 @@ 
 
         $frm_settings = FrmAppHelper::get_settings();
 
-        $submit = isset($form->options['submit_value']) ? $form->options['submit_value'] : $frm_settings->submit_value;
+        $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
 
         $user_ID = get_current_user_id();
 		$params = FrmForm::get_params( $form );
         $message = $errors = '';
 
         if ( $params['posted_form_id'] == $form->id && $_POST ) {
-            $errors = isset( $frm_vars['created_entries'][ $form->id ] ) ? $frm_vars['created_entries'][ $form->id ]['errors'] : array();
+            $errors = isset( $frm_vars['created_entries'][$form->id] ) ? $frm_vars['created_entries'][$form->id]['errors'] : array();
         }
 
 		$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
         $fields = FrmFieldsHelper::get_form_fields( $form->id, ( isset( $errors ) && ! empty( $errors ) ) );
 
         if ( $params['action'] != 'create' || $params['posted_form_id'] != $form->id || ! $_POST ) {
-            do_action('frm_display_form_action', $params, $fields, $form, $title, $description);
-            if ( apply_filters('frm_continue_to_new', true, $form->id, $params['action']) ) {
-                $values = FrmEntriesHelper::setup_new_vars($fields, $form);
+            do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
+            if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
+                $values = FrmEntriesHelper::setup_new_vars( $fields, $form );
 				include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
             }
             return;
         }
 
-        if ( ! empty($errors) ) {
-            $values = $fields ? FrmEntriesHelper::setup_new_vars($fields, $form) : array();
+        if ( ! empty( $errors ) ) {
+            $values = $fields ? FrmEntriesHelper::setup_new_vars( $fields, $form ) : array();
 			include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
             return;
         }
 
-        do_action('frm_validate_form_creation', $params, $fields, $form, $title, $description);
-        if ( ! apply_filters('frm_continue_to_create', true, $form->id) ) {
+        do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
+        if ( ! apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
             return;
         }
 
-        $values = FrmEntriesHelper::setup_new_vars($fields, $form, true);
-        $created = ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form->id ] ) ) ? $frm_vars['created_entries'][ $form->id ]['entry_id'] : 0;
-        $conf_method = apply_filters('frm_success_filter', 'message', $form, $form->options, 'create');
+        $values = FrmEntriesHelper::setup_new_vars( $fields, $form, true );
+        $created = ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][$form->id] ) ) ? $frm_vars['created_entries'][$form->id]['entry_id'] : 0;
+        $conf_method = apply_filters( 'frm_success_filter', 'message', $form, $form->options, 'create' );
 
-        if ( $created && is_numeric($created) && $conf_method != 'message' ) {
-            do_action('frm_success_action', $conf_method, $form, $form->options, $created);
+        if ( $created && is_numeric( $created ) && $conf_method != 'message' ) {
+            do_action( 'frm_success_action', $conf_method, $form, $form->options, $created );
 			do_action( 'frm_after_entry_processed', array( 'entry_id' => $created, 'form' => $form ) );
             return;
         }
 
-        if ( $created && is_numeric($created) ) {
-            $message = isset($form->options['success_msg']) ? $form->options['success_msg'] : $frm_settings->success_msg;
+        if ( $created && is_numeric( $created ) ) {
+            $message = isset( $form->options['success_msg'] ) ? $form->options['success_msg'] : $frm_settings->success_msg;
             $class = 'frm_message';
         } else {
             $message = $frm_settings->failed_msg;
@@ -1176,9 +1176,9 @@ 
 			'message' => $message, 'form' => $form,
 			'entry_id' => $created, 'class' => $class,
 		) );
-        $message = apply_filters('frm_main_feedback', $message, $form, $created);
+        $message = apply_filters( 'frm_main_feedback', $message, $form, $created );
 
-        if ( ! isset($form->options['show_form']) || $form->options['show_form'] ) {
+        if ( ! isset( $form->options['show_form'] ) || $form->options['show_form'] ) {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
         } else {
             global $frm_vars;

Doc Comments +11 added lines

@@ -159,6 +159,9 @@ 
 		wp_die();
 	}
 
+	/**
+	 * @param string $field
+	 */
 	private static function edit_in_place_value( $field ) {
 		check_ajax_referer( 'frm_ajax', 'nonce' );
 		FrmAppHelper::permission_check('frm_edit_forms', 'hide');
@@ -203,6 +206,9 @@ 
         }
     }
 
+    /**
+     * @return string
+     */
     public static function bulk_create_template( $ids ) {
         FrmAppHelper::permission_check( 'frm_edit_forms' );
 
@@ -698,6 +704,7 @@ 
 	/**
 	 * Get an array of the helper shortcodes to display in the customization panel
 	 * @since 2.0.6
+	 * @param boolean $settings_tab
 	 */
 	private static function get_shortcode_helpers( $settings_tab ) {
 		$entry_shortcodes = array(
@@ -771,6 +778,9 @@ 
         return $content;
     }
 
+	/**
+	 * @param boolean $entry
+	 */
 	private static function get_entry_by_param( &$entry ) {
 		if ( ! $entry || ! is_object( $entry ) ) {
 			if ( ! $entry || ! is_numeric( $entry ) ) {
@@ -1237,6 +1247,7 @@ 
 
 	/**
 	 * @since 2.0.8
+	 * @param string $content
 	 */
 	private static function maybe_minimize_form( $atts, &$content ) {
 		// check if minimizing is turned on

classes/helpers/FrmAppHelper.php

Spacing +209 added lines, -209 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -23,11 +23,11 @@ 
     }
 
     public static function plugin_folder() {
-        return basename(self::plugin_path());
+        return basename( self::plugin_path() );
     }
 
     public static function plugin_path() {
-        return dirname(dirname(dirname(__FILE__)));
+        return dirname( dirname( dirname( __FILE__ ) ) );
     }
 
     public static function plugin_url() {
@@ -54,7 +54,7 @@ 
      * @return string
      */
     public static function site_name() {
-        return get_option('blogname');
+        return get_option( 'blogname' );
     }
 
 	public static function make_affiliate_url( $url ) {
@@ -66,7 +66,7 @@ 
 	}
 
 	public static function get_affiliate() {
-		$affiliate_id = apply_filters( 'frm_affiliate_link', get_option('frm_aff') );
+		$affiliate_id = apply_filters( 'frm_affiliate_link', get_option( 'frm_aff' ) );
 		$affiliate_id = strtolower( $affiliate_id );
 		$allowed_affiliates = array( 'mojo' );
 		if ( ! in_array( $affiliate_id, $allowed_affiliates ) ) {
@@ -85,7 +85,7 @@ 
      */
     public static function get_settings() {
         global $frm_settings;
-        if ( empty($frm_settings) ) {
+        if ( empty( $frm_settings ) ) {
             $frm_settings = new FrmSettings();
         }
         return $frm_settings;
@@ -106,7 +106,7 @@ 
     }
 
     public static function pro_is_installed() {
-        return apply_filters('frm_pro_installed', false);
+        return apply_filters( 'frm_pro_installed', false );
     }
 
     /**
@@ -150,7 +150,7 @@ 
      * @return boolean
      */
     public static function doing_ajax() {
-        return defined('DOING_AJAX') && DOING_AJAX && ! self::is_preview_page();
+        return defined( 'DOING_AJAX' ) && DOING_AJAX && ! self::is_preview_page();
     }
 
 	/**
@@ -170,7 +170,7 @@ 
      * @return boolean
      */
     public static function is_admin() {
-        return is_admin() && ( ! defined('DOING_AJAX') || ! DOING_AJAX );
+        return is_admin() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX );
     }
 
     /**
@@ -196,7 +196,7 @@ 
      * @return string
      */
 	public static function get_server_value( $value ) {
-        return isset( $_SERVER[ $value ] ) ? wp_strip_all_tags( $_SERVER[ $value ] ) : '';
+        return isset( $_SERVER[$value] ) ? wp_strip_all_tags( $_SERVER[$value] ) : '';
     }
 
     /**
@@ -211,14 +211,14 @@ 
             'HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR', 'HTTP_X_FORWARDED', 'HTTP_X_CLUSTER_CLIENT_IP',
             'HTTP_FORWARDED_FOR', 'HTTP_FORWARDED', 'REMOTE_ADDR',
         ) as $key ) {
-            if ( ! isset( $_SERVER[ $key ] ) ) {
+            if ( ! isset( $_SERVER[$key] ) ) {
                 continue;
             }
 
-            foreach ( explode( ',', $_SERVER[ $key ] ) as $ip ) {
-                $ip = trim($ip); // just to be safe
+            foreach ( explode( ',', $_SERVER[$key] ) as $ip ) {
+                $ip = trim( $ip ); // just to be safe
 
-                if ( filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) !== false ) {
+                if ( filter_var( $ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE ) !== false ) {
                     return $ip;
                 }
             }
@@ -228,15 +228,15 @@ 
     }
 
     public static function get_param( $param, $default = '', $src = 'get', $sanitize = '' ) {
-        if ( strpos($param, '[') ) {
-            $params = explode('[', $param);
+        if ( strpos( $param, '[' ) ) {
+            $params = explode( '[', $param );
             $param = $params[0];
         }
 
 		if ( $src == 'get' ) {
-            $value = isset( $_POST[ $param ] ) ? stripslashes_deep( $_POST[ $param ] ) : ( isset( $_GET[ $param ] ) ? stripslashes_deep( $_GET[ $param ] ) : $default );
-            if ( ! isset( $_POST[ $param ] ) && isset( $_GET[ $param ] ) && ! is_array( $value ) ) {
-                $value = stripslashes_deep( htmlspecialchars_decode( urldecode( $_GET[ $param ] ) ) );
+            $value = isset( $_POST[$param] ) ? stripslashes_deep( $_POST[$param] ) : ( isset( $_GET[$param] ) ? stripslashes_deep( $_GET[$param] ) : $default );
+            if ( ! isset( $_POST[$param] ) && isset( $_GET[$param] ) && ! is_array( $value ) ) {
+                $value = stripslashes_deep( htmlspecialchars_decode( urldecode( $_GET[$param] ) ) );
             }
 			self::sanitize_value( $sanitize, $value );
 		} else {
@@ -245,12 +245,12 @@ 
 
 		if ( isset( $params ) && is_array( $value ) && ! empty( $value ) ) {
             foreach ( $params as $k => $p ) {
-                if ( ! $k || ! is_array($value) ) {
+                if ( ! $k || ! is_array( $value ) ) {
                     continue;
                 }
 
-                $p = trim($p, ']');
-                $value = isset( $value[ $p ] ) ? $value[ $p ] : $default;
+                $p = trim( $p, ']' );
+                $value = isset( $value[$p] ) ? $value[$p] : $default;
             }
         }
 
@@ -292,16 +292,16 @@ 
 
 		$value = $args['default'];
 		if ( $args['type'] == 'get' ) {
-			if ( $_GET && isset( $_GET[ $args['param'] ] ) ) {
-				$value = $_GET[ $args['param'] ];
+			if ( $_GET && isset( $_GET[$args['param']] ) ) {
+				$value = $_GET[$args['param']];
 			}
 		} else if ( $args['type'] == 'post' ) {
-			if ( isset( $_POST[ $args['param'] ] ) ) {
-				$value = stripslashes_deep( maybe_unserialize( $_POST[ $args['param'] ] ) );
+			if ( isset( $_POST[$args['param']] ) ) {
+				$value = stripslashes_deep( maybe_unserialize( $_POST[$args['param']] ) );
 			}
 		} else {
-			if ( isset( $_REQUEST[ $args['param'] ] ) ) {
-				$value = $_REQUEST[ $args['param'] ];
+			if ( isset( $_REQUEST[$args['param']] ) ) {
+				$value = $_REQUEST[$args['param']];
 			}
 		}
 
@@ -329,7 +329,7 @@ 
 			if ( is_array( $value ) ) {
 				$temp_values = $value;
 				foreach ( $temp_values as $k => $v ) {
-					FrmAppHelper::sanitize_value( $sanitize, $value[ $k ] );
+					FrmAppHelper::sanitize_value( $sanitize, $value[$k] );
 				}
 			} else {
 				$value = call_user_func( $sanitize, $value );
@@ -340,8 +340,8 @@ 
     public static function sanitize_request( $sanitize_method, &$values ) {
         $temp_values = $values;
         foreach ( $temp_values as $k => $val ) {
-            if ( isset( $sanitize_method[ $k ] ) ) {
-				$values[ $k ] = call_user_func( $sanitize_method[ $k ], $val );
+            if ( isset( $sanitize_method[$k] ) ) {
+				$values[$k] = call_user_func( $sanitize_method[$k], $val );
             }
         }
     }
@@ -349,7 +349,7 @@ 
 	public static function sanitize_array( &$values ) {
 		$temp_values = $values;
 		foreach ( $temp_values as $k => $val ) {
-			$values[ $k ] = wp_kses_post( $val );
+			$values[$k] = wp_kses_post( $val );
 		}
 	}
 
@@ -369,7 +369,7 @@ 
 
 		$allowed_html = array();
 		foreach ( $allowed as $a ) {
-			$allowed_html[ $a ] = isset( $html[ $a ] ) ? $html[ $a ] : array();
+			$allowed_html[$a] = isset( $html[$a] ) ? $html[$a] : array();
 		}
 
 		return wp_kses( $value, $allowed_html );
@@ -380,7 +380,7 @@ 
      * @since 2.0
      */
     public static function remove_get_action() {
-        if ( ! isset($_GET) ) {
+        if ( ! isset( $_GET ) ) {
             return;
         }
 
@@ -402,8 +402,8 @@ 
         }
 
         global $wp_query;
-        if ( isset( $wp_query->query_vars[ $param ] ) ) {
-            $value = $wp_query->query_vars[ $param ];
+        if ( isset( $wp_query->query_vars[$param] ) ) {
+            $value = $wp_query->query_vars[$param];
         }
 
         return $value;
@@ -432,16 +432,16 @@ 
      * @return mixed $results The cache or query results
      */
     public static function check_cache( $cache_key, $group = '', $query = '', $type = 'get_var', $time = 300 ) {
-        $results = wp_cache_get($cache_key, $group);
-        if ( ! self::is_empty_value( $results, false ) || empty($query) ) {
+        $results = wp_cache_get( $cache_key, $group );
+        if ( ! self::is_empty_value( $results, false ) || empty( $query ) ) {
             return $results;
         }
 
         if ( 'get_posts' == $type ) {
-            $results = get_posts($query);
+            $results = get_posts( $query );
         } else {
             global $wpdb;
-            $results = $wpdb->{$type}($query);
+            $results = $wpdb->{$type}( $query );
         }
 
 		if ( ! self::prevent_caching() ) {
@@ -465,9 +465,9 @@ 
         }
 
         // then check the transient
-        $results = get_transient($cache_key);
+        $results = get_transient( $cache_key );
         if ( $results ) {
-            wp_cache_set($cache_key, $results);
+            wp_cache_set( $cache_key, $results );
         }
 
         return $results;
@@ -478,7 +478,7 @@ 
      * @param string $cache_key
      */
 	public static function delete_cache_and_transient( $cache_key, $group = 'default' ) {
-		delete_transient($cache_key);
+		delete_transient( $cache_key );
 		wp_cache_delete( $cache_key, $group );
 	}
 
@@ -494,7 +494,7 @@ 
     	global $wp_object_cache;
 
 		if ( is_callable( array( $wp_object_cache, '__get' ) ) ) {
-			$group_cache = $wp_object_cache->__get('cache');
+			$group_cache = $wp_object_cache->__get( 'cache' );
 		} elseif ( is_callable( array( $wp_object_cache, 'redis_status' ) ) && $wp_object_cache->redis_status() ) {
 			// check if the object cache is overridden by Redis
 			$wp_object_cache->flush();
@@ -504,8 +504,8 @@ 
 			$group_cache = $wp_object_cache->cache;
 		}
 
-		if ( isset( $group_cache[ $group ] ) ) {
-			foreach ( $group_cache[ $group ] as $k => $v ) {
+		if ( isset( $group_cache[$group] ) ) {
+			foreach ( $group_cache[$group] as $k => $v ) {
 				wp_cache_delete( $k, $group );
 			}
 			return true;
@@ -535,17 +535,17 @@ 
     }
 
     public static function get_pages() {
-		return get_posts( array( 'post_type' => 'page', 'post_status' => array( 'publish', 'private' ), 'numberposts' => -1, 'orderby' => 'title', 'order' => 'ASC' ) );
+		return get_posts( array( 'post_type' => 'page', 'post_status' => array( 'publish', 'private' ), 'numberposts' => - 1, 'orderby' => 'title', 'order' => 'ASC' ) );
     }
 
     public static function wp_pages_dropdown( $field_name, $page_id, $truncate = false ) {
         $pages = self::get_pages();
 		$selected = self::get_post_param( $field_name, $page_id, 'absint' );
     ?>
-        <select name="<?php echo esc_attr($field_name); ?>" id="<?php echo esc_attr($field_name); ?>" class="frm-pages-dropdown">
+        <select name="<?php echo esc_attr( $field_name ); ?>" id="<?php echo esc_attr( $field_name ); ?>" class="frm-pages-dropdown">
             <option value=""> </option>
             <?php foreach ( $pages as $page ) { ?>
-				<option value="<?php echo esc_attr($page->ID); ?>" <?php selected( $selected, $page->ID ) ?>>
+				<option value="<?php echo esc_attr( $page->ID ); ?>" <?php selected( $selected, $page->ID ) ?>>
 					<?php echo esc_html( $truncate ? self::truncate( $page->post_title, $truncate ) : $page->post_title ); ?>
 				</option>
             <?php } ?>
@@ -554,7 +554,7 @@ 
     }
 
 	public static function post_edit_link( $post_id ) {
-        $post = get_post($post_id);
+        $post = get_post( $post_id );
         if ( $post ) {
 			$post_url = admin_url( 'post.php?post=' . $post_id . '&action=edit' );
 			return '<a href="' . esc_url( $post_url ) . '">' . self::truncate( $post->post_title, 50 ) . '</a>';
@@ -564,17 +564,17 @@ 
 
 	public static function wp_roles_dropdown( $field_name, $capability, $multiple = 'single' ) {
     ?>
-        <select name="<?php echo esc_attr($field_name); ?>" id="<?php echo esc_attr($field_name); ?>" <?php
+        <select name="<?php echo esc_attr( $field_name ); ?>" id="<?php echo esc_attr( $field_name ); ?>" <?php
             echo ( 'multiple' == $multiple ) ? 'multiple="multiple"' : '';
             ?> class="frm_multiselect">
-            <?php self::roles_options($capability); ?>
+            <?php self::roles_options( $capability ); ?>
         </select>
     <?php
     }
 
 	public static function roles_options( $capability ) {
         global $frm_vars;
-        if ( isset($frm_vars['editable_roles']) ) {
+        if ( isset( $frm_vars['editable_roles'] ) ) {
             $editable_roles = $frm_vars['editable_roles'];
         } else {
             $editable_roles = get_editable_roles();
@@ -582,10 +582,10 @@ 
         }
 
         foreach ( $editable_roles as $role => $details ) {
-            $name = translate_user_role($details['name'] ); ?>
-        <option value="<?php echo esc_attr($role) ?>" <?php echo in_array($role, (array) $capability) ? ' selected="selected"' : ''; ?>><?php echo esc_attr($name) ?> </option>
+            $name = translate_user_role( $details['name'] ); ?>
+        <option value="<?php echo esc_attr( $role ) ?>" <?php echo in_array( $role, (array) $capability ) ? ' selected="selected"' : ''; ?>><?php echo esc_attr( $name ) ?> </option>
 <?php
-            unset($role, $details);
+            unset( $role, $details );
         }
     }
 
@@ -641,7 +641,7 @@ 
     public static function maybe_add_permissions() {
 		self::force_capability( 'frm_view_entries' );
 
-        if ( ! current_user_can('administrator') || current_user_can('frm_view_forms') ) {
+        if ( ! current_user_can( 'administrator' ) || current_user_can( 'frm_view_forms' ) ) {
             return;
         }
 
@@ -650,7 +650,7 @@ 
         $frm_roles = self::frm_capabilities();
         foreach ( $frm_roles as $frm_role => $frm_role_description ) {
 			$user->add_cap( $frm_role );
-            unset($frm_role, $frm_role_description);
+            unset( $frm_role, $frm_role_description );
         }
     }
 
@@ -675,12 +675,12 @@ 
      * @param string $permission
      */
 	public static function permission_check( $permission, $show_message = 'show' ) {
-        $permission_error = self::permission_nonce_error($permission);
+        $permission_error = self::permission_nonce_error( $permission );
         if ( $permission_error !== false ) {
             if ( 'hide' == $show_message ) {
                 $permission_error = '';
             }
-            wp_die($permission_error);
+            wp_die( $permission_error );
         }
     }
 
@@ -697,11 +697,11 @@ 
 		}
 
 		$error = false;
-        if ( empty($nonce_name) ) {
+        if ( empty( $nonce_name ) ) {
             return $error;
         }
 
-        if ( $_REQUEST && ( ! isset( $_REQUEST[ $nonce_name ] ) || ! wp_verify_nonce( $_REQUEST[ $nonce_name ], $nonce ) ) ) {
+        if ( $_REQUEST && ( ! isset( $_REQUEST[$nonce_name] ) || ! wp_verify_nonce( $_REQUEST[$nonce_name], $nonce ) ) ) {
             $frm_settings = self::get_settings();
             $error = $frm_settings->admin_permission;
         }
@@ -781,7 +781,7 @@ 
 			} else {
 				foreach ( $value as $k => $v ) {
 					if ( ! is_array( $v ) ) {
-						$value[ $k ] = call_user_func( $original_function, $v );
+						$value[$k] = call_user_func( $original_function, $v );
 					}
 				}
 			}
@@ -802,11 +802,11 @@ 
 	public static function array_flatten( $array, $keys = 'keep' ) {
         $return = array();
         foreach ( $array as $key => $value ) {
-            if ( is_array($value) ) {
+            if ( is_array( $value ) ) {
 				$return = array_merge( $return, self::array_flatten( $value, $keys ) );
             } else {
 				if ( $keys == 'keep' ) {
-					$return[ $key ] = $value;
+					$return[$key] = $value;
 				} else {
 					$return[] = $value;
 				}
@@ -829,8 +829,8 @@ 
      * @since 2.0
      */
 	public static function use_wpautop( $content ) {
-        if ( apply_filters('frm_use_wpautop', true) ) {
-            $content = wpautop(str_replace( '<br>', '<br />', $content));
+        if ( apply_filters( 'frm_use_wpautop', true ) ) {
+            $content = wpautop( str_replace( '<br>', '<br />', $content ) );
         }
         return $content;
     }
@@ -848,8 +848,8 @@ 
      * @return string The base Google APIS url for the current version of jQuery UI
      */
     public static function jquery_ui_base_url() {
-		$url = 'http' . ( is_ssl() ? 's' : '' ) . '://ajax.googleapis.com/ajax/libs/jqueryui/' . self::script_version('jquery-ui-core');
-        $url = apply_filters('frm_jquery_ui_base_url', $url);
+		$url = 'http' . ( is_ssl() ? 's' : '' ) . '://ajax.googleapis.com/ajax/libs/jqueryui/' . self::script_version( 'jquery-ui-core' );
+        $url = apply_filters( 'frm_jquery_ui_base_url', $url );
         return $url;
     }
 
@@ -864,11 +864,11 @@ 
 
         $ver = 0;
 
-        if ( ! isset( $wp_scripts->registered[ $handle ] ) ) {
+        if ( ! isset( $wp_scripts->registered[$handle] ) ) {
             return $ver;
         }
 
-        $query = $wp_scripts->registered[ $handle ];
+        $query = $wp_scripts->registered[$handle];
     	if ( is_object( $query ) ) {
     	    $ver = $query->ver;
     	}
@@ -881,36 +881,36 @@ 
     }
 
 	public static function get_user_id_param( $user_id ) {
-        if ( ! $user_id || empty($user_id) || is_numeric($user_id) ) {
+        if ( ! $user_id || empty( $user_id ) || is_numeric( $user_id ) ) {
             return $user_id;
         }
 
 		if ( $user_id == 'current' ) {
 			$user_id = get_current_user_id();
 		} else {
-            if ( is_email($user_id) ) {
-                $user = get_user_by('email', $user_id);
+            if ( is_email( $user_id ) ) {
+                $user = get_user_by( 'email', $user_id );
             } else {
-                $user = get_user_by('login', $user_id);
+                $user = get_user_by( 'login', $user_id );
             }
 
             if ( $user ) {
                 $user_id = $user->ID;
             }
-            unset($user);
+            unset( $user );
         }
 
         return $user_id;
     }
 
 	public static function get_file_contents( $filename, $atts = array() ) {
-        if ( ! is_file($filename) ) {
+        if ( ! is_file( $filename ) ) {
             return false;
         }
 
-        extract($atts);
+        extract( $atts );
         ob_start();
-        include($filename);
+        include( $filename );
         $contents = ob_get_contents();
         ob_end_clean();
         return $contents;
@@ -926,28 +926,28 @@ 
         $key = '';
 
         if ( ! empty( $name ) ) {
-            $key = sanitize_key($name);
+            $key = sanitize_key( $name );
         }
 
 		if ( empty( $key ) ) {
-            $max_slug_value = pow(36, $num_chars);
+            $max_slug_value = pow( 36, $num_chars );
             $min_slug_value = 37; // we want to have at least 2 characters in the slug
-            $key = base_convert( rand($min_slug_value, $max_slug_value), 10, 36 );
+            $key = base_convert( rand( $min_slug_value, $max_slug_value ), 10, 36 );
         }
 
-		if ( is_numeric($key) || in_array( $key, array( 'id', 'key', 'created-at', 'detaillink', 'editlink', 'siteurl', 'evenodd' ) ) ) {
+		if ( is_numeric( $key ) || in_array( $key, array( 'id', 'key', 'created-at', 'detaillink', 'editlink', 'siteurl', 'evenodd' ) ) ) {
 			$key = $key . 'a';
         }
 
 		$key_check = FrmDb::get_var( $table_name, array( $column => $key, 'ID !' => $id ), $column );
 
-        if ( $key_check || is_numeric($key_check) ) {
+        if ( $key_check || is_numeric( $key_check ) ) {
             $suffix = 2;
 			do {
 				$alt_post_name = substr( $key, 0, 200 - ( strlen( $suffix ) + 1 ) ) . $suffix;
 				$key_check = FrmDb::get_var( $table_name, array( $column => $alt_post_name, 'ID !' => $id ), $column );
-				$suffix++;
-			} while ($key_check || is_numeric($key_check));
+				$suffix ++;
+			} while ( $key_check || is_numeric( $key_check ) );
 			$key = $alt_post_name;
         }
         return $key;
@@ -963,32 +963,32 @@ 
             return false;
         }
 
-        if ( empty($post_values) ) {
-            $post_values = stripslashes_deep($_POST);
+        if ( empty( $post_values ) ) {
+            $post_values = stripslashes_deep( $_POST );
         }
 
 		$values = array( 'id' => $record->id, 'fields' => array() );
 
 		foreach ( array( 'name', 'description' ) as $var ) {
-            $default_val = isset($record->{$var}) ? $record->{$var} : '';
-			$values[ $var ] = self::get_param( $var, $default_val, 'get', 'wp_kses_post' );
-            unset($var, $default_val);
+            $default_val = isset( $record->{$var}) ? $record->{$var} : '';
+			$values[$var] = self::get_param( $var, $default_val, 'get', 'wp_kses_post' );
+            unset( $var, $default_val );
         }
 
-        $values['description'] = self::use_wpautop($values['description']);
+        $values['description'] = self::use_wpautop( $values['description'] );
         $frm_settings = self::get_settings();
-        $is_form_builder = self::is_admin_page('formidable' );
+        $is_form_builder = self::is_admin_page( 'formidable' );
 
         foreach ( (array) $fields as $field ) {
             // Make sure to filter default values (for placeholder text), but not on the form builder page
             if ( ! $is_form_builder ) {
-                $field->default_value = apply_filters('frm_get_default_value', $field->default_value, $field, true );
+                $field->default_value = apply_filters( 'frm_get_default_value', $field->default_value, $field, true );
             }
 			$parent_form_id = isset( $args['parent_form_id'] ) ? $args['parent_form_id'] : $field->form_id;
-			self::fill_field_defaults($field, $record, $values, compact('default', 'post_values', 'frm_settings', 'parent_form_id' ) );
+			self::fill_field_defaults( $field, $record, $values, compact( 'default', 'post_values', 'frm_settings', 'parent_form_id' ) );
         }
 
-        self::fill_form_opts($record, $table, $post_values, $values);
+        self::fill_form_opts( $record, $table, $post_values, $values );
 
         if ( $table == 'entries' ) {
             $values = FrmEntriesHelper::setup_edit_vars( $values, $record );
@@ -1005,8 +1005,8 @@ 
         if ( $args['default'] ) {
             $meta_value = $field->default_value;
         } else {
-            if ( $record->post_id && self::pro_is_installed() && isset($field->field_options['post_field']) && $field->field_options['post_field'] ) {
-                if ( ! isset($field->field_options['custom_field']) ) {
+            if ( $record->post_id && self::pro_is_installed() && isset( $field->field_options['post_field'] ) && $field->field_options['post_field'] ) {
+                if ( ! isset( $field->field_options['custom_field'] ) ) {
                     $field->field_options['custom_field'] = '';
                 }
 				$meta_value = FrmProEntryMetaHelper::get_post_value( $record->post_id, $field->field_options['post_field'], $field->field_options['custom_field'], array( 'truncate' => false, 'type' => $field->type, 'form_id' => $field->form_id, 'field' => $field ) );
@@ -1015,8 +1015,8 @@ 
             }
         }
 
-		$field_type = isset( $post_values['field_options'][ 'type_' . $field->id ] ) ? $post_values['field_options'][ 'type_' . $field->id ] : $field->type;
-        $new_value = isset( $post_values['item_meta'][ $field->id ] ) ? maybe_unserialize( $post_values['item_meta'][ $field->id ] ) : $meta_value;
+		$field_type = isset( $post_values['field_options']['type_' . $field->id] ) ? $post_values['field_options']['type_' . $field->id] : $field->type;
+        $new_value = isset( $post_values['item_meta'][$field->id] ) ? maybe_unserialize( $post_values['item_meta'][$field->id] ) : $meta_value;
 
         $field_array = array(
             'id'            => $field->id,
@@ -1024,7 +1024,7 @@ 
             'default_value' => $field->default_value,
             'name'          => $field->name,
             'description'   => $field->description,
-            'type'          => apply_filters('frm_field_type', $field_type, $field, $new_value),
+            'type'          => apply_filters( 'frm_field_type', $field_type, $field, $new_value ),
             'options'       => $field->options,
             'required'      => $field->required,
             'field_key'     => $field->field_key,
@@ -1034,40 +1034,40 @@ 
         );
 
         $args['field_type'] = $field_type;
-        self::fill_field_opts($field, $field_array, $args);
+        self::fill_field_opts( $field, $field_array, $args );
 		// Track the original field's type
 		$field_array['original_type'] = isset( $field->field_options['original_type'] ) ? $field->field_options['original_type'] : $field->type;
 
         $field_array = apply_filters( 'frm_setup_edit_fields_vars', $field_array, $field, $values['id'], array() );
 
-        if ( ! isset($field_array['unique']) || ! $field_array['unique'] ) {
+        if ( ! isset( $field_array['unique'] ) || ! $field_array['unique'] ) {
             $field_array['unique_msg'] = '';
         }
 
         $field_array = array_merge( $field->field_options, $field_array );
 
-        $values['fields'][ $field->id ] = $field_array;
+        $values['fields'][$field->id] = $field_array;
     }
 
 	private static function fill_field_opts( $field, array &$field_array, $args ) {
         $post_values = $args['post_values'];
-        $opt_defaults = FrmFieldsHelper::get_default_field_opts($field_array['type'], $field, true);
+        $opt_defaults = FrmFieldsHelper::get_default_field_opts( $field_array['type'], $field, true );
 
         foreach ( $opt_defaults as $opt => $default_opt ) {
-			$field_array[ $opt ] = ( $post_values && isset( $post_values['field_options'][ $opt . '_' . $field->id ] ) ) ? maybe_unserialize( $post_values['field_options'][ $opt . '_' . $field->id ] ) : ( isset( $field->field_options[ $opt ] ) ? $field->field_options[ $opt ] : $default_opt );
-            if ( $opt == 'blank' && $field_array[ $opt ] == '' ) {
-                $field_array[ $opt ] = $args['frm_settings']->blank_msg;
-            } else if ( $opt == 'invalid' && $field_array[ $opt ] == '' ) {
+			$field_array[$opt] = ( $post_values && isset( $post_values['field_options'][$opt . '_' . $field->id] ) ) ? maybe_unserialize( $post_values['field_options'][$opt . '_' . $field->id] ) : ( isset( $field->field_options[$opt] ) ? $field->field_options[$opt] : $default_opt );
+            if ( $opt == 'blank' && $field_array[$opt] == '' ) {
+                $field_array[$opt] = $args['frm_settings']->blank_msg;
+            } else if ( $opt == 'invalid' && $field_array[$opt] == '' ) {
                 if ( $args['field_type'] == 'captcha' ) {
-                    $field_array[ $opt ] = $args['frm_settings']->re_msg;
+                    $field_array[$opt] = $args['frm_settings']->re_msg;
                 } else {
-                    $field_array[ $opt ] = sprintf( __( '%s is invalid', 'formidable' ), $field_array['name'] );
+                    $field_array[$opt] = sprintf( __( '%s is invalid', 'formidable' ), $field_array['name'] );
                 }
             }
         }
 
         if ( $field_array['custom_html'] == '' ) {
-            $field_array['custom_html'] = FrmFieldsHelper::get_default_html($args['field_type']);
+            $field_array['custom_html'] = FrmFieldsHelper::get_default_html( $args['field_type'] );
         }
     }
 
@@ -1086,18 +1086,18 @@ 
             return;
         }
 
-        $values['form_name'] = isset($record->form_id) ? $form->name : '';
+        $values['form_name'] = isset( $record->form_id ) ? $form->name : '';
 		$values['parent_form_id'] = isset( $record->form_id ) ? $form->parent_form_id : 0;
 
-        if ( ! is_array($form->options) ) {
+        if ( ! is_array( $form->options ) ) {
             return;
         }
 
         foreach ( $form->options as $opt => $value ) {
-            $values[ $opt ] = isset( $post_values[ $opt ] ) ? maybe_unserialize( $post_values[ $opt ] ) : $value;
+            $values[$opt] = isset( $post_values[$opt] ) ? maybe_unserialize( $post_values[$opt] ) : $value;
         }
 
-        self::fill_form_defaults($post_values, $values);
+        self::fill_form_defaults( $post_values, $values );
     }
 
     /**
@@ -1107,23 +1107,23 @@ 
         $form_defaults = FrmFormsHelper::get_default_opts();
 
         foreach ( $form_defaults as $opt => $default ) {
-            if ( ! isset( $values[ $opt ] ) || $values[ $opt ] == '' ) {
-				$values[ $opt ] = ( $post_values && isset( $post_values['options'][ $opt ] ) ) ? $post_values['options'][ $opt ] : $default;
+            if ( ! isset( $values[$opt] ) || $values[$opt] == '' ) {
+				$values[$opt] = ( $post_values && isset( $post_values['options'][$opt] ) ) ? $post_values['options'][$opt] : $default;
             }
 
-            unset($opt, $defaut);
+            unset( $opt, $defaut );
         }
 
-        if ( ! isset($values['custom_style']) ) {
+        if ( ! isset( $values['custom_style'] ) ) {
             $frm_settings = self::get_settings();
 			$values['custom_style'] = ( $post_values && isset( $post_values['options']['custom_style'] ) ) ? absint( $_POST['options']['custom_style'] ) : ( $frm_settings->load_style != 'none' );
         }
 
 		foreach ( array( 'before', 'after', 'submit' ) as $h ) {
-			if ( ! isset( $values[ $h . '_html' ] ) ) {
-				$values[ $h . '_html' ] = ( isset( $post_values['options'][ $h . '_html' ] ) ? $post_values['options'][ $h . '_html' ] : FrmFormsHelper::get_default_html( $h ) );
+			if ( ! isset( $values[$h . '_html'] ) ) {
+				$values[$h . '_html'] = ( isset( $post_values['options'][$h . '_html'] ) ? $post_values['options'][$h . '_html'] : FrmFormsHelper::get_default_html( $h ) );
             }
-            unset($h);
+            unset( $h );
         }
     }
 
@@ -1139,9 +1139,9 @@ 
         }
     ?>
 <li>
-    <a href="javascript:void(0)" class="frmids frm_insert_code alignright <?php echo esc_attr($class) ?>" data-code="<?php echo esc_attr($args['id']) ?>" >[<?php echo esc_attr( $args['id'] ) ?>]</a>
-    <a href="javascript:void(0)" class="frmkeys frm_insert_code alignright <?php echo esc_attr($class) ?>" data-code="<?php echo esc_attr($args['key']) ?>" >[<?php echo esc_attr( self::truncate($args['key'], 10) ) ?>]</a>
-    <a href="javascript:void(0)" class="frm_insert_code <?php echo esc_attr( $class ) ?>" data-code="<?php echo esc_attr($args['id']) ?>" ><?php echo esc_attr( self::truncate($args['name'], 60) ) ?></a>
+    <a href="javascript:void(0)" class="frmids frm_insert_code alignright <?php echo esc_attr( $class ) ?>" data-code="<?php echo esc_attr( $args['id'] ) ?>" >[<?php echo esc_attr( $args['id'] ) ?>]</a>
+    <a href="javascript:void(0)" class="frmkeys frm_insert_code alignright <?php echo esc_attr( $class ) ?>" data-code="<?php echo esc_attr( $args['key'] ) ?>" >[<?php echo esc_attr( self::truncate( $args['key'], 10 ) ) ?>]</a>
+    <a href="javascript:void(0)" class="frm_insert_code <?php echo esc_attr( $class ) ?>" data-code="<?php echo esc_attr( $args['id'] ) ?>" ><?php echo esc_attr( self::truncate( $args['name'], 60 ) ) ?></a>
 </li>
     <?php
     }
@@ -1159,7 +1159,7 @@ 
             return '';
         } else if ( $length <= 10 ) {
 			$sub = self::mb_function( array( 'mb_substr', 'substr' ), array( $str, 0, $length ) );
-            return $sub . (($length < $original_len) ? $continue : '');
+            return $sub . ( ( $length < $original_len ) ? $continue : '' );
         }
 
         $sub = '';
@@ -1168,23 +1168,23 @@ 
 		$words = self::mb_function( array( 'mb_split', 'explode' ), array( ' ', $str ) );
 
 		foreach ( $words as $word ) {
-            $part = (($sub != '') ? ' ' : '') . $word;
+            $part = ( ( $sub != '' ) ? ' ' : '' ) . $word;
 			$total_len = self::mb_function( array( 'mb_strlen', 'strlen' ), array( $sub . $part ) );
-            if ( $total_len > $length && str_word_count($sub) ) {
+            if ( $total_len > $length && str_word_count( $sub ) ) {
                 break;
             }
 
             $sub .= $part;
 			$len += self::mb_function( array( 'mb_strlen', 'strlen' ), array( $part ) );
 
-            if ( str_word_count($sub) > $minword && $total_len >= $length ) {
+            if ( str_word_count( $sub ) > $minword && $total_len >= $length ) {
                 break;
             }
 
-            unset($total_len, $word);
+            unset( $total_len, $word );
         }
 
-        return $sub . (($len < $original_len) ? $continue : '');
+        return $sub . ( ( $len < $original_len ) ? $continue : '' );
     }
 
 	public static function mb_function( $function_names, $args ) {
@@ -1197,17 +1197,17 @@ 
 	}
 
 	public static function get_formatted_time( $date, $date_format = '', $time_format = '' ) {
-        if ( empty($date) ) {
+        if ( empty( $date ) ) {
             return $date;
         }
 
-        if ( empty($date_format) ) {
-            $date_format = get_option('date_format');
+        if ( empty( $date_format ) ) {
+            $date_format = get_option( 'date_format' );
         }
 
-        if ( preg_match('/^\d{1-2}\/\d{1-2}\/\d{4}$/', $date) && self::pro_is_installed() ) {
+        if ( preg_match( '/^\d{1-2}\/\d{1-2}\/\d{4}$/', $date ) && self::pro_is_installed() ) {
             $frmpro_settings = new FrmProSettings();
-            $date = FrmProAppHelper::convert_date($date, $frmpro_settings->date_format, 'Y-m-d');
+            $date = FrmProAppHelper::convert_date( $date, $frmpro_settings->date_format, 'Y-m-d' );
         }
 
 		$formatted = self::get_localized_date( $date_format, $date );
@@ -1222,7 +1222,7 @@ 
 
 	private static function add_time_to_date( $time_format, $date ) {
 		if ( empty( $time_format ) ) {
-			$time_format = get_option('time_format');
+			$time_format = get_option( 'time_format' );
 		}
 
 		$trimmed_format = trim( $time_format );
@@ -1268,10 +1268,10 @@ 
 		$time_strings = self::get_time_strings();
 
 		foreach ( $time_strings as $k => $v ) {
-			if ( $diff[ $k ] ) {
-				$time_strings[ $k ] = $diff[ $k ] . ' ' . ( $diff[ $k ] > 1 ? $v[1] : $v[0] );
+			if ( $diff[$k] ) {
+				$time_strings[$k] = $diff[$k] . ' ' . ( $diff[$k] > 1 ? $v[1] : $v[0] );
 			} else {
-				unset( $time_strings[ $k ] );
+				unset( $time_strings[$k] );
 			}
 		}
 
@@ -1309,7 +1309,7 @@ 
      */
 	public static function esc_like( $term ) {
         global $wpdb;
-        if ( method_exists($wpdb, 'esc_like') ) {
+        if ( method_exists( $wpdb, 'esc_like' ) ) {
 			// WP 4.0
             $term = $wpdb->esc_like( $term );
         } else {
@@ -1323,17 +1323,17 @@ 
      * @param string $order_query
      */
 	public static function esc_order( $order_query ) {
-        if ( empty($order_query) ) {
+        if ( empty( $order_query ) ) {
             return '';
         }
 
         // remove ORDER BY before santizing
-        $order_query = strtolower($order_query);
-        if ( strpos($order_query, 'order by') !== false ) {
-            $order_query = str_replace('order by', '', $order_query);
+        $order_query = strtolower( $order_query );
+        if ( strpos( $order_query, 'order by' ) !== false ) {
+            $order_query = str_replace( 'order by', '', $order_query );
         }
 
-        $order_query = explode(' ', trim($order_query));
+        $order_query = explode( ' ', trim( $order_query ) );
 
         $order_fields = array(
             'id', 'form_key', 'name', 'description',
@@ -1341,13 +1341,13 @@ 
             'default_template', 'status', 'created_at',
         );
 
-        $order = trim(trim(reset($order_query), ','));
-        if ( ! in_array($order, $order_fields) ) {
+        $order = trim( trim( reset( $order_query ), ',' ) );
+        if ( ! in_array( $order, $order_fields ) ) {
             return '';
         }
 
         $order_by = '';
-        if ( count($order_query) > 1 ) {
+        if ( count( $order_query ) > 1 ) {
 			$order_by = end( $order_query );
 			self::esc_order_by( $order_by );
         }
@@ -1369,23 +1369,23 @@ 
      * @param string $limit
      */
 	public static function esc_limit( $limit ) {
-        if ( empty($limit) ) {
+        if ( empty( $limit ) ) {
             return '';
         }
 
-        $limit = trim(str_replace(' limit', '', strtolower($limit)));
-        if ( is_numeric($limit) ) {
+        $limit = trim( str_replace( ' limit', '', strtolower( $limit ) ) );
+        if ( is_numeric( $limit ) ) {
 			return ' LIMIT ' . $limit;
         }
 
-        $limit = explode(',', trim($limit));
+        $limit = explode( ',', trim( $limit ) );
         foreach ( $limit as $k => $l ) {
             if ( is_numeric( $l ) ) {
-                $limit[ $k ] = $l;
+                $limit[$k] = $l;
             }
         }
 
-        $limit = implode(',', $limit);
+        $limit = implode( ',', $limit );
 		return ' LIMIT ' . $limit;
     }
 
@@ -1394,12 +1394,12 @@ 
      * @since 2.0
      */
     public static function prepare_array_values( $array, $type = '%s' ) {
-        $placeholders = array_fill(0, count($array), $type);
-        return implode(', ', $placeholders);
+        $placeholders = array_fill( 0, count( $array ), $type );
+        return implode( ', ', $placeholders );
     }
 
     public static function prepend_and_or_where( $starts_with = ' WHERE ', $where = '' ) {
-        if ( empty($where) ) {
+        if ( empty( $where ) ) {
             return '';
         }
 
@@ -1440,19 +1440,19 @@ 
 	public static function json_to_array( $json_vars ) {
         $vars = array();
         foreach ( $json_vars as $jv ) {
-            $jv_name = explode('[', $jv['name']);
-            $last = count($jv_name) - 1;
+            $jv_name = explode( '[', $jv['name'] );
+            $last = count( $jv_name ) - 1;
             foreach ( $jv_name as $p => $n ) {
-                $name = trim($n, ']');
-                if ( ! isset($l1) ) {
+                $name = trim( $n, ']' );
+                if ( ! isset( $l1 ) ) {
                     $l1 = $name;
                 }
 
-                if ( ! isset($l2) ) {
+                if ( ! isset( $l2 ) ) {
                     $l2 = $name;
                 }
 
-                if ( ! isset($l3) ) {
+                if ( ! isset( $l3 ) ) {
                     $l3 = $name;
                 }
 
@@ -1466,24 +1466,24 @@ 
 
                     case 1:
                         $l2 = $name;
-                        self::add_value_to_array( $name, $l2, $this_val, $vars[ $l1 ] );
+                        self::add_value_to_array( $name, $l2, $this_val, $vars[$l1] );
                     break;
 
                     case 2:
                         $l3 = $name;
-                        self::add_value_to_array( $name, $l3, $this_val, $vars[ $l1 ][ $l2 ] );
+                        self::add_value_to_array( $name, $l3, $this_val, $vars[$l1][$l2] );
                     break;
 
                     case 3:
                         $l4 = $name;
-                        self::add_value_to_array( $name, $l4, $this_val, $vars[ $l1 ][ $l2 ][ $l3 ] );
+                        self::add_value_to_array( $name, $l4, $this_val, $vars[$l1][$l2][$l3] );
                     break;
                 }
 
-                unset($this_val, $n);
+                unset( $this_val, $n );
             }
 
-            unset($last, $jv);
+            unset( $last, $jv );
         }
 
         return $vars;
@@ -1496,8 +1496,8 @@ 
     public static function add_value_to_array( $name, $l1, $val, &$vars ) {
         if ( $name == '' ) {
             $vars[] = $val;
-        } else if ( ! isset( $vars[ $l1 ] ) ) {
-            $vars[ $l1 ] = $val;
+        } else if ( ! isset( $vars[$l1] ) ) {
+            $vars[$l1] = $val;
         }
     }
 
@@ -1512,7 +1512,7 @@ 
             'email_subject' => esc_attr( sprintf( __( 'If you leave the subject blank, the default will be used: %1$s Form submitted on %2$s', 'formidable' ), $form_name, self::site_name() ) ),
         );
 
-        if ( ! isset( $tooltips[ $name ] ) ) {
+        if ( ! isset( $tooltips[$name] ) ) {
             return;
         }
 
@@ -1522,7 +1522,7 @@ 
             echo ' class="frm_help"';
         }
 
-		echo ' title="' . esc_attr( $tooltips[ $name ] );
+		echo ' title="' . esc_attr( $tooltips[$name] );
 
         if ( 'open' != $class ) {
             echo '"';
@@ -1574,13 +1574,13 @@ 
     }
 
 	private static function prepare_action_slashes( $val, $key, &$post_content ) {
-		if ( ! isset( $post_content[ $key ] ) ) {
+		if ( ! isset( $post_content[$key] ) ) {
 			return;
 		}
 
 		if ( is_array( $val ) ) {
 			foreach ( $val as $k1 => $v1 ) {
-				self::prepare_action_slashes( $v1, $k1, $post_content[ $key ] );
+				self::prepare_action_slashes( $v1, $k1, $post_content[$key] );
 				unset( $k1, $v1 );
 			}
 		} else {
@@ -1588,7 +1588,7 @@ 
 			$val = stripslashes( $val );
 
 			// Add backslashes before double quotes and forward slashes only
-			$post_content[ $key ] = addcslashes( $val, '"\\/' );
+			$post_content[$key] = addcslashes( $val, '"\\/' );
 		}
 	}
 
@@ -1605,7 +1605,7 @@ 
 		$settings['post_content'] = FrmAppHelper::prepare_and_encode( $settings['post_content'] );
 
 		if ( empty( $settings['ID'] ) ) {
-			unset( $settings['ID']);
+			unset( $settings['ID'] );
 		}
 
 		// delete all caches for this group
@@ -1639,17 +1639,17 @@ 
 	}
 
 	public static function maybe_json_decode( $string ) {
-        if ( is_array($string) ) {
+        if ( is_array( $string ) ) {
             return $string;
         }
 
-        $new_string = json_decode($string, true);
-        if ( function_exists('json_last_error') ) {
+        $new_string = json_decode( $string, true );
+        if ( function_exists( 'json_last_error' ) ) {
 			// php 5.3+
             if ( json_last_error() == JSON_ERROR_NONE ) {
                 $string = $new_string;
             }
-        } else if ( isset($new_string) ) {
+        } else if ( isset( $new_string ) ) {
 			// php < 5.3 fallback
             $string = $new_string;
         }
@@ -1665,11 +1665,11 @@ 
 	public static function maybe_highlight_menu( $post_type ) {
         global $post;
 
-        if ( isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != $post_type ) {
+        if ( isset( $_REQUEST['post_type'] ) && $_REQUEST['post_type'] != $post_type ) {
             return;
         }
 
-        if ( is_object($post) && $post->post_type != $post_type ) {
+        if ( is_object( $post ) && $post->post_type != $post_type ) {
             return;
         }
 
@@ -1768,11 +1768,11 @@ 
         $frm_version = self::plugin_version();
 
         // check if Formidable meets minimum requirements
-        if ( version_compare($frm_version, $min_version, '>=') ) {
+        if ( version_compare( $frm_version, $min_version, '>=' ) ) {
             return;
         }
 
-        $wp_list_table = _get_list_table('WP_Plugins_List_Table');
+        $wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
 		echo '<tr class="plugin-update-tr active"><th colspan="' . absint( $wp_list_table->get_column_count() ) . '" class="check-column plugin-update colspanchange"><div class="update-message">' .
         __( 'You are running an outdated version of Formidable. This plugin may not work correctly if you do not update Formidable.', 'formidable' ) .
         '</div></td></tr>';
@@ -1780,38 +1780,38 @@ 
 
     public static function locales( $type = 'date' ) {
         $locales = array(
-            'en' => __( 'English', 'formidable' ),    '' => __( 'English/Western', 'formidable' ),
-            'af' => __( 'Afrikaans', 'formidable' ),  'sq' => __( 'Albanian', 'formidable' ),
-            'ar' => __( 'Arabic', 'formidable' ),     'hy' => __( 'Armenian', 'formidable' ),
+            'en' => __( 'English', 'formidable' ), '' => __( 'English/Western', 'formidable' ),
+            'af' => __( 'Afrikaans', 'formidable' ), 'sq' => __( 'Albanian', 'formidable' ),
+            'ar' => __( 'Arabic', 'formidable' ), 'hy' => __( 'Armenian', 'formidable' ),
             'az' => __( 'Azerbaijani', 'formidable' ), 'eu' => __( 'Basque', 'formidable' ),
-            'bs' => __( 'Bosnian', 'formidable' ),    'bg' => __( 'Bulgarian', 'formidable' ),
-            'ca' => __( 'Catalan', 'formidable' ),    'zh-HK' => __( 'Chinese Hong Kong', 'formidable' ),
+            'bs' => __( 'Bosnian', 'formidable' ), 'bg' => __( 'Bulgarian', 'formidable' ),
+            'ca' => __( 'Catalan', 'formidable' ), 'zh-HK' => __( 'Chinese Hong Kong', 'formidable' ),
             'zh-CN' => __( 'Chinese Simplified', 'formidable' ), 'zh-TW' => __( 'Chinese Traditional', 'formidable' ),
-            'hr' => __( 'Croatian', 'formidable' ),   'cs' => __( 'Czech', 'formidable' ),
-            'da' => __( 'Danish', 'formidable' ),     'nl' => __( 'Dutch', 'formidable' ),
+            'hr' => __( 'Croatian', 'formidable' ), 'cs' => __( 'Czech', 'formidable' ),
+            'da' => __( 'Danish', 'formidable' ), 'nl' => __( 'Dutch', 'formidable' ),
             'en-GB' => __( 'English/UK', 'formidable' ), 'eo' => __( 'Esperanto', 'formidable' ),
-            'et' => __( 'Estonian', 'formidable' ),   'fo' => __( 'Faroese', 'formidable' ),
+            'et' => __( 'Estonian', 'formidable' ), 'fo' => __( 'Faroese', 'formidable' ),
             'fa' => __( 'Farsi/Persian', 'formidable' ), 'fil' => __( 'Filipino', 'formidable' ),
-            'fi' => __( 'Finnish', 'formidable' ),    'fr' => __( 'French', 'formidable' ),
+            'fi' => __( 'Finnish', 'formidable' ), 'fr' => __( 'French', 'formidable' ),
             'fr-CA' => __( 'French/Canadian', 'formidable' ), 'fr-CH' => __( 'French/Swiss', 'formidable' ),
-            'de' => __( 'German', 'formidable' ),     'de-AT' => __( 'German/Austria', 'formidable' ),
+            'de' => __( 'German', 'formidable' ), 'de-AT' => __( 'German/Austria', 'formidable' ),
             'de-CH' => __( 'German/Switzerland', 'formidable' ), 'el' => __( 'Greek', 'formidable' ),
-            'he' => __( 'Hebrew', 'formidable' ),     'iw' => __( 'Hebrew', 'formidable' ),
-            'hi' => __( 'Hindi', 'formidable' ),      'hu' => __( 'Hungarian', 'formidable' ),
-            'is' => __( 'Icelandic', 'formidable' ),  'id' => __( 'Indonesian', 'formidable' ),
-            'it' => __( 'Italian', 'formidable' ),    'ja' => __( 'Japanese', 'formidable' ),
-            'ko' => __( 'Korean', 'formidable' ),     'lv' => __( 'Latvian', 'formidable' ),
+            'he' => __( 'Hebrew', 'formidable' ), 'iw' => __( 'Hebrew', 'formidable' ),
+            'hi' => __( 'Hindi', 'formidable' ), 'hu' => __( 'Hungarian', 'formidable' ),
+            'is' => __( 'Icelandic', 'formidable' ), 'id' => __( 'Indonesian', 'formidable' ),
+            'it' => __( 'Italian', 'formidable' ), 'ja' => __( 'Japanese', 'formidable' ),
+            'ko' => __( 'Korean', 'formidable' ), 'lv' => __( 'Latvian', 'formidable' ),
             'lt' => __( 'Lithuanian', 'formidable' ), 'ms' => __( 'Malaysian', 'formidable' ),
-            'no' => __( 'Norwegian', 'formidable' ),  'pl' => __( 'Polish', 'formidable' ),
+            'no' => __( 'Norwegian', 'formidable' ), 'pl' => __( 'Polish', 'formidable' ),
             'pt' => __( 'Portuguese', 'formidable' ), 'pt-BR' => __( 'Portuguese/Brazilian', 'formidable' ),
             'pt-PT' => __( 'Portuguese/Portugal', 'formidable' ), 'ro' => __( 'Romanian', 'formidable' ),
-            'ru' => __( 'Russian', 'formidable' ),    'sr' => __( 'Serbian', 'formidable' ),
+            'ru' => __( 'Russian', 'formidable' ), 'sr' => __( 'Serbian', 'formidable' ),
             'sr-SR' => __( 'Serbian', 'formidable' ), 'sk' => __( 'Slovak', 'formidable' ),
-            'sl' => __( 'Slovenian', 'formidable' ),  'es' => __( 'Spanish', 'formidable' ),
+            'sl' => __( 'Slovenian', 'formidable' ), 'es' => __( 'Spanish', 'formidable' ),
             'es-419' => __( 'Spanish/Latin America', 'formidable' ), 'sv' => __( 'Swedish', 'formidable' ),
-            'ta' => __( 'Tamil', 'formidable' ),      'th' => __( 'Thai', 'formidable' ),
-            'tu' => __( 'Turkish', 'formidable' ),    'tr' => __( 'Turkish', 'formidable' ),
-            'uk' => __( 'Ukranian', 'formidable' ),   'vi' => __( 'Vietnamese', 'formidable' ),
+            'ta' => __( 'Tamil', 'formidable' ), 'th' => __( 'Thai', 'formidable' ),
+            'tu' => __( 'Turkish', 'formidable' ), 'tr' => __( 'Turkish', 'formidable' ),
+            'uk' => __( 'Ukranian', 'formidable' ), 'vi' => __( 'Vietnamese', 'formidable' ),
         );
 
         if ( $type == 'captcha' ) {
@@ -1830,8 +1830,8 @@ 
             );
         }
 
-        $locales = array_diff_key($locales, array_flip($unset));
-        $locales = apply_filters('frm_locales', $locales);
+        $locales = array_diff_key( $locales, array_flip( $unset ) );
+        $locales = apply_filters( 'frm_locales', $locales );
 
         return $locales;
     }

Doc Comments +10 added lines, -1 removed lines

@@ -362,7 +362,7 @@ 
 	 * Sanitize the value, and allow some HTML
 	 * @since 2.0
 	 * @param string $value
-	 * @param array $allowed
+	 * @param string[] $allowed
 	 * @return string
 	 */
 	public static function kses( $value, $allowed = array() ) {
@@ -779,6 +779,9 @@ 
 		return FrmFieldsHelper::prepare_other_input( $args, $other_opt, $checked );
     }
 
+	/**
+	 * @param string $function
+	 */
 	public static function recursive_function_map( $value, $function ) {
 		if ( is_array( $value ) ) {
 			$original_function = $function;
@@ -1198,6 +1201,9 @@ 
         return $sub . (($len < $original_len) ? $continue : '');
     }
 
+	/**
+	 * @param string[] $function_names
+	 */
 	public static function mb_function( $function_names, $args ) {
 		$mb_function_name = $function_names[0];
 		$function_name = $function_names[1];
@@ -1231,6 +1237,9 @@ 
         return $formatted;
     }
 
+	/**
+	 * @param string $time_format
+	 */
 	private static function add_time_to_date( $time_format, $date ) {
 		if ( empty( $time_format ) ) {
 			$time_format = get_option('time_format');

Indentation +1040 added lines, -1040 removed lines

@@ -12,50 +12,50 @@ 
 	 */
 	public static $plug_version = '2.02.06';
 
-    /**
-     * @since 1.07.02
-     *
-     * @param none
-     * @return string The version of this plugin
-     */
-    public static function plugin_version() {
-        return self::$plug_version;
-    }
-
-    public static function plugin_folder() {
-        return basename(self::plugin_path());
-    }
-
-    public static function plugin_path() {
-        return dirname(dirname(dirname(__FILE__)));
-    }
-
-    public static function plugin_url() {
-        //prevously FRM_URL constant
+	/**
+	 * @since 1.07.02
+	 *
+	 * @param none
+	 * @return string The version of this plugin
+	 */
+	public static function plugin_version() {
+		return self::$plug_version;
+	}
+
+	public static function plugin_folder() {
+		return basename(self::plugin_path());
+	}
+
+	public static function plugin_path() {
+		return dirname(dirname(dirname(__FILE__)));
+	}
+
+	public static function plugin_url() {
+		//prevously FRM_URL constant
 		return plugins_url( '', self::plugin_path() . '/formidable.php' );
-    }
+	}
 
 	public static function relative_plugin_url() {
 		return str_replace( array( 'https:', 'http:' ), '', self::plugin_url() );
 	}
 
-    /**
-     * @return string Site URL
-     */
-    public static function site_url() {
-        return site_url();
-    }
-
-    /**
-     * Get the name of this site
-     * Used for [sitename] shortcode
-     *
-     * @since 2.0
-     * @return string
-     */
-    public static function site_name() {
-        return get_option('blogname');
-    }
+	/**
+	 * @return string Site URL
+	 */
+	public static function site_url() {
+		return site_url();
+	}
+
+	/**
+	 * Get the name of this site
+	 * Used for [sitename] shortcode
+	 *
+	 * @since 2.0
+	 * @return string
+	 */
+	public static function site_name() {
+		return get_option('blogname');
+	}
 
 	public static function make_affiliate_url( $url ) {
 		$affiliate_id = self::get_affiliate();
@@ -75,83 +75,83 @@ 
 		return $affiliate_id;
 	}
 
-    /**
-     * Get the Formidable settings
-     *
-     * @since 2.0
-     *
-     * @param None
-     * @return FrmSettings $frm_setings
-     */
-    public static function get_settings() {
-        global $frm_settings;
-        if ( empty($frm_settings) ) {
-            $frm_settings = new FrmSettings();
-        }
-        return $frm_settings;
-    }
+	/**
+	 * Get the Formidable settings
+	 *
+	 * @since 2.0
+	 *
+	 * @param None
+	 * @return FrmSettings $frm_setings
+	 */
+	public static function get_settings() {
+		global $frm_settings;
+		if ( empty($frm_settings) ) {
+			$frm_settings = new FrmSettings();
+		}
+		return $frm_settings;
+	}
 
 	public static function get_menu_name() {
 		$frm_settings = FrmAppHelper::get_settings();
 		return $frm_settings->menu;
 	}
 
-    /**
-     * Show a message in place of pro features
-     *
-     * @since 2.0
-     */
+	/**
+	 * Show a message in place of pro features
+	 *
+	 * @since 2.0
+	 */
 	public static function update_message() {
 		_deprecated_function( __FUNCTION__, '2.0.19' );
-    }
-
-    public static function pro_is_installed() {
-        return apply_filters('frm_pro_installed', false);
-    }
-
-    /**
-     * Check for certain page in Formidable settings
-     *
-     * @since 2.0
-     *
-     * @param string $page The name of the page to check
-     * @return boolean
-     */
+	}
+
+	public static function pro_is_installed() {
+		return apply_filters('frm_pro_installed', false);
+	}
+
+	/**
+	 * Check for certain page in Formidable settings
+	 *
+	 * @since 2.0
+	 *
+	 * @param string $page The name of the page to check
+	 * @return boolean
+	 */
 	public static function is_admin_page( $page = 'formidable' ) {
-        global $pagenow;
+		global $pagenow;
 		$get_page = self::simple_get( 'page', 'sanitize_title' );
-        if ( $pagenow ) {
+		if ( $pagenow ) {
 			return $pagenow == 'admin.php' && $get_page == $page;
-        }
+		}
 
 		return is_admin() && $get_page == $page;
-    }
-
-    /**
-     * Check for the form preview page
-     *
-     * @since 2.0
-     *
-     * @param None
-     * @return boolean
-     */
-    public static function is_preview_page() {
-        global $pagenow;
+	}
+
+	/**
+	 * Check for the form preview page
+	 *
+	 * @since 2.0
+	 *
+	 * @param None
+	 * @return boolean
+	 */
+	public static function is_preview_page() {
+		global $pagenow;
 		$action = FrmAppHelper::simple_get( 'action', 'sanitize_title' );
 		return $pagenow && $pagenow == 'admin-ajax.php' && $action == 'frm_forms_preview';
-    }
+	}
 
-    /**
-     * Check for ajax except the form preview page
-     *
-     * @since 2.0
-     *
-     * @param None
-     * @return boolean
-     */
-    public static function doing_ajax() {
-        return defined('DOING_AJAX') && DOING_AJAX && ! self::is_preview_page();
-    }
+	/**
+	 * Check for ajax except the form preview page
+	 *
+	 * @since 2.0
+	 *
+	 * @param None
+	 * @return boolean
+	 */
+	public static function doing_ajax() {
+		return defined('DOING_AJAX') && DOING_AJAX && ! self::is_preview_page();
+	}
 
 	/**
 	 * @since 2.0.8
@@ -161,102 +161,102 @@ 
 		return isset( $frm_vars['prevent_caching'] ) && $frm_vars['prevent_caching'];
 	}
 
-    /**
-     * Check if on an admin page
-     *
-     * @since 2.0
-     *
-     * @param None
-     * @return boolean
-     */
-    public static function is_admin() {
-        return is_admin() && ( ! defined('DOING_AJAX') || ! DOING_AJAX );
-    }
-
-    /**
-     * Check if value contains blank value or empty array
-     *
-     * @since 2.0
-     * @param mixed $value - value to check
+	/**
+	 * Check if on an admin page
+	 *
+	 * @since 2.0
+	 *
+	 * @param None
+	 * @return boolean
+	 */
+	public static function is_admin() {
+		return is_admin() && ( ! defined('DOING_AJAX') || ! DOING_AJAX );
+	}
+
+	/**
+	 * Check if value contains blank value or empty array
+	 *
+	 * @since 2.0
+	 * @param mixed $value - value to check
 	 * @param string
-     * @return boolean
-     */
-    public static function is_empty_value( $value, $empty = '' ) {
-        return ( is_array( $value ) && empty( $value ) ) || $value == $empty;
-    }
-
-    public static function is_not_empty_value( $value, $empty = '' ) {
-        return ! self::is_empty_value( $value, $empty );
-    }
-
-    /**
-     * Get any value from the $_SERVER
-     *
-     * @since 2.0
-     * @param string $value
-     * @return string
-     */
+	 * @return boolean
+	 */
+	public static function is_empty_value( $value, $empty = '' ) {
+		return ( is_array( $value ) && empty( $value ) ) || $value == $empty;
+	}
+
+	public static function is_not_empty_value( $value, $empty = '' ) {
+		return ! self::is_empty_value( $value, $empty );
+	}
+
+	/**
+	 * Get any value from the $_SERVER
+	 *
+	 * @since 2.0
+	 * @param string $value
+	 * @return string
+	 */
 	public static function get_server_value( $value ) {
-        return isset( $_SERVER[ $value ] ) ? wp_strip_all_tags( $_SERVER[ $value ] ) : '';
-    }
-
-    /**
-     * Check for the IP address in several places
-     * Used by [ip] shortcode
-     *
-     * @return string The IP address of the current user
-     */
-    public static function get_ip_address() {
+		return isset( $_SERVER[ $value ] ) ? wp_strip_all_tags( $_SERVER[ $value ] ) : '';
+	}
+
+	/**
+	 * Check for the IP address in several places
+	 * Used by [ip] shortcode
+	 *
+	 * @return string The IP address of the current user
+	 */
+	public static function get_ip_address() {
 		$ip = '';
-        foreach ( array(
-            'HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR', 'HTTP_X_FORWARDED', 'HTTP_X_CLUSTER_CLIENT_IP',
-            'HTTP_FORWARDED_FOR', 'HTTP_FORWARDED', 'REMOTE_ADDR',
-        ) as $key ) {
-            if ( ! isset( $_SERVER[ $key ] ) ) {
-                continue;
-            }
-
-            foreach ( explode( ',', $_SERVER[ $key ] ) as $ip ) {
-                $ip = trim($ip); // just to be safe
-
-                if ( filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) !== false ) {
-                    return $ip;
-                }
-            }
-        }
+		foreach ( array(
+			'HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR', 'HTTP_X_FORWARDED', 'HTTP_X_CLUSTER_CLIENT_IP',
+			'HTTP_FORWARDED_FOR', 'HTTP_FORWARDED', 'REMOTE_ADDR',
+		) as $key ) {
+			if ( ! isset( $_SERVER[ $key ] ) ) {
+				continue;
+			}
+
+			foreach ( explode( ',', $_SERVER[ $key ] ) as $ip ) {
+				$ip = trim($ip); // just to be safe
+
+				if ( filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) !== false ) {
+					return $ip;
+				}
+			}
+		}
 
 		return sanitize_text_field( $ip );
-    }
+	}
 
-    public static function get_param( $param, $default = '', $src = 'get', $sanitize = '' ) {
-        if ( strpos($param, '[') ) {
-            $params = explode('[', $param);
-            $param = $params[0];
-        }
+	public static function get_param( $param, $default = '', $src = 'get', $sanitize = '' ) {
+		if ( strpos($param, '[') ) {
+			$params = explode('[', $param);
+			$param = $params[0];
+		}
 
 		if ( $src == 'get' ) {
-            $value = isset( $_POST[ $param ] ) ? stripslashes_deep( $_POST[ $param ] ) : ( isset( $_GET[ $param ] ) ? stripslashes_deep( $_GET[ $param ] ) : $default );
-            if ( ! isset( $_POST[ $param ] ) && isset( $_GET[ $param ] ) && ! is_array( $value ) ) {
-                $value = stripslashes_deep( htmlspecialchars_decode( urldecode( $_GET[ $param ] ) ) );
-            }
+			$value = isset( $_POST[ $param ] ) ? stripslashes_deep( $_POST[ $param ] ) : ( isset( $_GET[ $param ] ) ? stripslashes_deep( $_GET[ $param ] ) : $default );
+			if ( ! isset( $_POST[ $param ] ) && isset( $_GET[ $param ] ) && ! is_array( $value ) ) {
+				$value = stripslashes_deep( htmlspecialchars_decode( urldecode( $_GET[ $param ] ) ) );
+			}
 			self::sanitize_value( $sanitize, $value );
 		} else {
-            $value = self::get_simple_request( array( 'type' => $src, 'param' => $param, 'default' => $default, 'sanitize' => $sanitize ) );
-        }
+			$value = self::get_simple_request( array( 'type' => $src, 'param' => $param, 'default' => $default, 'sanitize' => $sanitize ) );
+		}
 
 		if ( isset( $params ) && is_array( $value ) && ! empty( $value ) ) {
-            foreach ( $params as $k => $p ) {
-                if ( ! $k || ! is_array($value) ) {
-                    continue;
-                }
+			foreach ( $params as $k => $p ) {
+				if ( ! $k || ! is_array($value) ) {
+					continue;
+				}
 
-                $p = trim($p, ']');
-                $value = isset( $value[ $p ] ) ? $value[ $p ] : $default;
-            }
-        }
+				$p = trim($p, ']');
+				$value = isset( $value[ $p ] ) ? $value[ $p ] : $default;
+			}
+		}
 
-        return $value;
-    }
+		return $value;
+	}
 
 	/**
 	 *
@@ -279,7 +279,7 @@ 
 	 */
 	public static function simple_get( $param, $sanitize = 'sanitize_text_field', $default = '' ) {
 		return self::get_simple_request( array( 'type' => 'get', 'param' => $param, 'default' => $default, 'sanitize' => $sanitize ) );
-    }
+	}
 
 	/**
 	 * Get a GET/POST/REQUEST value and sanitize it
@@ -315,12 +315,12 @@ 
 	}
 
 	/**
-	* Preserve backslashes in a value, but make sure value doesn't get compounding slashes
-	*
-	* @since 2.0.8
-	* @param string $value
-	* @return string $value
-	*/
+	 * Preserve backslashes in a value, but make sure value doesn't get compounding slashes
+	 *
+	 * @since 2.0.8
+	 * @param string $value
+	 * @return string $value
+	 */
 	public static function preserve_backslashes( $value ) {
 		// If backslashes have already been added, don't add them again
 		if ( strpos( $value, '\\\\' ) === false ) {
@@ -342,14 +342,14 @@ 
 		}
 	}
 
-    public static function sanitize_request( $sanitize_method, &$values ) {
-        $temp_values = $values;
-        foreach ( $temp_values as $k => $val ) {
-            if ( isset( $sanitize_method[ $k ] ) ) {
+	public static function sanitize_request( $sanitize_method, &$values ) {
+		$temp_values = $values;
+		foreach ( $temp_values as $k => $val ) {
+			if ( isset( $sanitize_method[ $k ] ) ) {
 				$values[ $k ] = call_user_func( $sanitize_method[ $k ], $val );
-            }
-        }
-    }
+			}
+		}
+	}
 
 	public static function sanitize_array( &$values ) {
 		$temp_values = $values;
@@ -367,12 +367,12 @@ 
 	 */
 	public static function kses( $value, $allowed = array() ) {
 		$html = array(
-		    'a' => array(
+			'a' => array(
 				'href'  => array(),
 				'title' => array(),
 				'id'    => array(),
 				'class' => array(),
-		    ),
+			),
 		);
 
 		$allowed_html = array();
@@ -383,126 +383,126 @@ 
 		return wp_kses( $value, $allowed_html );
 	}
 
-    /**
-     * Used when switching the action for a bulk action
-     * @since 2.0
-     */
-    public static function remove_get_action() {
-        if ( ! isset($_GET) ) {
-            return;
-        }
+	/**
+	 * Used when switching the action for a bulk action
+	 * @since 2.0
+	 */
+	public static function remove_get_action() {
+		if ( ! isset($_GET) ) {
+			return;
+		}
 
-        $new_action = isset( $_GET['action'] ) ? sanitize_text_field( $_GET['action'] ) : ( isset( $_GET['action2'] ) ? sanitize_text_field( $_GET['action2'] ) : '' );
-        if ( ! empty( $new_action ) ) {
+		$new_action = isset( $_GET['action'] ) ? sanitize_text_field( $_GET['action'] ) : ( isset( $_GET['action2'] ) ? sanitize_text_field( $_GET['action2'] ) : '' );
+		if ( ! empty( $new_action ) ) {
 			$_SERVER['REQUEST_URI'] = str_replace( '&action=' . $new_action, '', FrmAppHelper::get_server_value( 'REQUEST_URI' ) );
-        }
-    }
-
-    /**
-     * Check the WP query for a parameter
-     *
-     * @since 2.0
-     * @return string|array
-     */
-    public static function get_query_var( $value, $param ) {
-        if ( $value != '' ) {
-            return $value;
-        }
-
-        global $wp_query;
-        if ( isset( $wp_query->query_vars[ $param ] ) ) {
-            $value = $wp_query->query_vars[ $param ];
-        }
-
-        return $value;
-    }
-
-    /**
-     * @param string $type
-     */
-    public static function trigger_hook_load( $type, $object = null ) {
-        // only load the form hooks once
+		}
+	}
+
+	/**
+	 * Check the WP query for a parameter
+	 *
+	 * @since 2.0
+	 * @return string|array
+	 */
+	public static function get_query_var( $value, $param ) {
+		if ( $value != '' ) {
+			return $value;
+		}
+
+		global $wp_query;
+		if ( isset( $wp_query->query_vars[ $param ] ) ) {
+			$value = $wp_query->query_vars[ $param ];
+		}
+
+		return $value;
+	}
+
+	/**
+	 * @param string $type
+	 */
+	public static function trigger_hook_load( $type, $object = null ) {
+		// only load the form hooks once
 		$hooks_loaded = apply_filters( 'frm_' . $type . '_hooks_loaded', false, $object );
-        if ( ! $hooks_loaded ) {
+		if ( ! $hooks_loaded ) {
 			do_action( 'frm_load_' . $type . '_hooks' );
-        }
-    }
-
-    /**
-     * Check cache before fetching values and saving to cache
-     *
-     * @since 2.0
-     *
-     * @param string $cache_key The unique name for this cache
-     * @param string $group The name of the cache group
-     * @param string $query If blank, don't run a db call
-     * @param string $type The wpdb function to use with this query
-     * @return mixed $results The cache or query results
-     */
-    public static function check_cache( $cache_key, $group = '', $query = '', $type = 'get_var', $time = 300 ) {
-        $results = wp_cache_get($cache_key, $group);
-        if ( ! self::is_empty_value( $results, false ) || empty($query) ) {
-            return $results;
-        }
-
-        if ( 'get_posts' == $type ) {
-            $results = get_posts($query);
+		}
+	}
+
+	/**
+	 * Check cache before fetching values and saving to cache
+	 *
+	 * @since 2.0
+	 *
+	 * @param string $cache_key The unique name for this cache
+	 * @param string $group The name of the cache group
+	 * @param string $query If blank, don't run a db call
+	 * @param string $type The wpdb function to use with this query
+	 * @return mixed $results The cache or query results
+	 */
+	public static function check_cache( $cache_key, $group = '', $query = '', $type = 'get_var', $time = 300 ) {
+		$results = wp_cache_get($cache_key, $group);
+		if ( ! self::is_empty_value( $results, false ) || empty($query) ) {
+			return $results;
+		}
+
+		if ( 'get_posts' == $type ) {
+			$results = get_posts($query);
 		} else if ( 'get_associative_results' == $type ) {
 			global $wpdb;
 			$results = $wpdb->get_results( $query, OBJECT_K );
-        } else {
-            global $wpdb;
-            $results = $wpdb->{$type}($query);
-        }
+		} else {
+			global $wpdb;
+			$results = $wpdb->{$type}($query);
+		}
 
 		if ( ! self::prevent_caching() ) {
 			wp_cache_set( $cache_key, $results, $group, $time );
 		}
 
-        return $results;
-    }
+		return $results;
+	}
 
-    /**
-     * Data that should be stored for a long time can be stored in a transient.
-     * First check the cache, then check the transient
-     * @since 2.0
-     * @return mixed The cached value or false
-     */
+	/**
+	 * Data that should be stored for a long time can be stored in a transient.
+	 * First check the cache, then check the transient
+	 * @since 2.0
+	 * @return mixed The cached value or false
+	 */
 	public static function check_cache_and_transient( $cache_key ) {
-        // check caching layer first
-        $results = self::check_cache( $cache_key );
-        if ( $results ) {
-            return $results;
-        }
-
-        // then check the transient
-        $results = get_transient($cache_key);
-        if ( $results ) {
-            wp_cache_set($cache_key, $results);
-        }
-
-        return $results;
-    }
-
-    /**
-     * @since 2.0
-     * @param string $cache_key
-     */
+		// check caching layer first
+		$results = self::check_cache( $cache_key );
+		if ( $results ) {
+			return $results;
+		}
+
+		// then check the transient
+		$results = get_transient($cache_key);
+		if ( $results ) {
+			wp_cache_set($cache_key, $results);
+		}
+
+		return $results;
+	}
+
+	/**
+	 * @since 2.0
+	 * @param string $cache_key
+	 */
 	public static function delete_cache_and_transient( $cache_key, $group = 'default' ) {
 		delete_transient($cache_key);
 		wp_cache_delete( $cache_key, $group );
 	}
 
-    /**
-     * Delete all caching in a single group
-     *
-     * @since 2.0
-     *
-     * @param string $group The name of the cache group
-     * @return boolean True or False
-     */
+	/**
+	 * Delete all caching in a single group
+	 *
+	 * @since 2.0
+	 *
+	 * @param string $group The name of the cache group
+	 * @return boolean True or False
+	 */
 	public static function cache_delete_group( $group ) {
-    	global $wp_object_cache;
+		global $wp_object_cache;
 
 		if ( is_callable( array( $wp_object_cache, '__get' ) ) ) {
 			$group_cache = $wp_object_cache->__get('cache');
@@ -522,37 +522,37 @@ 
 			return true;
 		}
 
-    	return false;
-    }
+		return false;
+	}
 
-    /**
-     * Check a value from a shortcode to see if true or false.
-     * True when value is 1, true, 'true', 'yes'
-     *
-     * @since 1.07.10
-     *
-     * @param string $value The value to compare
-     * @return boolean True or False
-     */
+	/**
+	 * Check a value from a shortcode to see if true or false.
+	 * True when value is 1, true, 'true', 'yes'
+	 *
+	 * @since 1.07.10
+	 *
+	 * @param string $value The value to compare
+	 * @return boolean True or False
+	 */
 	public static function is_true( $value ) {
-        return ( true === $value || 1 == $value || 'true' == $value || 'yes' == $value );
-    }
+		return ( true === $value || 1 == $value || 'true' == $value || 'yes' == $value );
+	}
 
-    /**
-     * Used to filter shortcode in text widgets
-     */
-    public static function widget_text_filter_callback( $matches ) {
-        return do_shortcode( $matches[0] );
-    }
+	/**
+	 * Used to filter shortcode in text widgets
+	 */
+	public static function widget_text_filter_callback( $matches ) {
+		return do_shortcode( $matches[0] );
+	}
 
-    public static function get_pages() {
+	public static function get_pages() {
 		return get_posts( array( 'post_type' => 'page', 'post_status' => array( 'publish', 'private' ), 'numberposts' => -1, 'orderby' => 'title', 'order' => 'ASC' ) );
-    }
+	}
 
-    public static function wp_pages_dropdown( $field_name, $page_id, $truncate = false ) {
-        $pages = self::get_pages();
+	public static function wp_pages_dropdown( $field_name, $page_id, $truncate = false ) {
+		$pages = self::get_pages();
 		$selected = self::get_post_param( $field_name, $page_id, 'absint' );
-    ?>
+	?>
         <select name="<?php echo esc_attr($field_name); ?>" id="<?php echo esc_attr($field_name); ?>" class="frm-pages-dropdown">
             <option value=""> </option>
             <?php foreach ( $pages as $page ) { ?>
@@ -562,108 +562,108 @@ 
             <?php } ?>
         </select>
     <?php
-    }
+	}
 
 	public static function post_edit_link( $post_id ) {
-        $post = get_post($post_id);
-        if ( $post ) {
+		$post = get_post($post_id);
+		if ( $post ) {
 			$post_url = admin_url( 'post.php?post=' . $post_id . '&action=edit' );
 			return '<a href="' . esc_url( $post_url ) . '">' . self::truncate( $post->post_title, 50 ) . '</a>';
-        }
-        return '';
-    }
+		}
+		return '';
+	}
 
 	public static function wp_roles_dropdown( $field_name, $capability, $multiple = 'single' ) {
-    ?>
+	?>
         <select name="<?php echo esc_attr($field_name); ?>" id="<?php echo esc_attr($field_name); ?>" <?php
-            echo ( 'multiple' == $multiple ) ? 'multiple="multiple"' : '';
-            ?> class="frm_multiselect">
+			echo ( 'multiple' == $multiple ) ? 'multiple="multiple"' : '';
+			?> class="frm_multiselect">
             <?php self::roles_options($capability); ?>
         </select>
     <?php
-    }
+	}
 
 	public static function roles_options( $capability ) {
-        global $frm_vars;
-        if ( isset($frm_vars['editable_roles']) ) {
-            $editable_roles = $frm_vars['editable_roles'];
-        } else {
-            $editable_roles = get_editable_roles();
-            $frm_vars['editable_roles'] = $editable_roles;
-        }
-
-        foreach ( $editable_roles as $role => $details ) {
-            $name = translate_user_role($details['name'] ); ?>
+		global $frm_vars;
+		if ( isset($frm_vars['editable_roles']) ) {
+			$editable_roles = $frm_vars['editable_roles'];
+		} else {
+			$editable_roles = get_editable_roles();
+			$frm_vars['editable_roles'] = $editable_roles;
+		}
+
+		foreach ( $editable_roles as $role => $details ) {
+			$name = translate_user_role($details['name'] ); ?>
         <option value="<?php echo esc_attr($role) ?>" <?php echo in_array($role, (array) $capability) ? ' selected="selected"' : ''; ?>><?php echo esc_attr($name) ?> </option>
 <?php
-            unset($role, $details);
-        }
-    }
+			unset($role, $details);
+		}
+	}
 
 	public static function frm_capabilities( $type = 'auto' ) {
-        $cap = array(
-            'frm_view_forms'        => __( 'View Forms and Templates', 'formidable' ),
-            'frm_edit_forms'        => __( 'Add/Edit Forms and Templates', 'formidable' ),
-            'frm_delete_forms'      => __( 'Delete Forms and Templates', 'formidable' ),
-            'frm_change_settings'   => __( 'Access this Settings Page', 'formidable' ),
-            'frm_view_entries'      => __( 'View Entries from Admin Area', 'formidable' ),
-            'frm_delete_entries'    => __( 'Delete Entries from Admin Area', 'formidable' ),
-        );
+		$cap = array(
+			'frm_view_forms'        => __( 'View Forms and Templates', 'formidable' ),
+			'frm_edit_forms'        => __( 'Add/Edit Forms and Templates', 'formidable' ),
+			'frm_delete_forms'      => __( 'Delete Forms and Templates', 'formidable' ),
+			'frm_change_settings'   => __( 'Access this Settings Page', 'formidable' ),
+			'frm_view_entries'      => __( 'View Entries from Admin Area', 'formidable' ),
+			'frm_delete_entries'    => __( 'Delete Entries from Admin Area', 'formidable' ),
+		);
 
 		if ( ! self::pro_is_installed() && 'pro' != $type ) {
-            return $cap;
-        }
+			return $cap;
+		}
 
-        $cap['frm_create_entries'] = __( 'Add Entries from Admin Area', 'formidable' );
-        $cap['frm_edit_entries'] = __( 'Edit Entries from Admin Area', 'formidable' );
-        $cap['frm_view_reports'] = __( 'View Reports', 'formidable' );
-        $cap['frm_edit_displays'] = __( 'Add/Edit Views', 'formidable' );
+		$cap['frm_create_entries'] = __( 'Add Entries from Admin Area', 'formidable' );
+		$cap['frm_edit_entries'] = __( 'Edit Entries from Admin Area', 'formidable' );
+		$cap['frm_view_reports'] = __( 'View Reports', 'formidable' );
+		$cap['frm_edit_displays'] = __( 'Add/Edit Views', 'formidable' );
 
-        return $cap;
-    }
+		return $cap;
+	}
 
 	public static function user_has_permission( $needed_role ) {
-        if ( $needed_role == '-1' ) {
-            return false;
+		if ( $needed_role == '-1' ) {
+			return false;
 		}
 
-        // $needed_role will be equal to blank if "Logged-in users" is selected
-        if ( ( $needed_role == '' && is_user_logged_in() ) || current_user_can( $needed_role ) ) {
-            return true;
-        }
+		// $needed_role will be equal to blank if "Logged-in users" is selected
+		if ( ( $needed_role == '' && is_user_logged_in() ) || current_user_can( $needed_role ) ) {
+			return true;
+		}
 
-        $roles = array( 'administrator', 'editor', 'author', 'contributor', 'subscriber' );
-        foreach ( $roles as $role ) {
+		$roles = array( 'administrator', 'editor', 'author', 'contributor', 'subscriber' );
+		foreach ( $roles as $role ) {
 			if ( current_user_can( $role ) ) {
-        		return true;
+				return true;
 			}
-        	if ( $role == $needed_role ) {
-        		break;
+			if ( $role == $needed_role ) {
+				break;
 			}
-        }
-        return false;
-    }
-
-    /**
-     * Make sure administrators can see Formidable menu
-     *
-     * @since 2.0
-     */
-    public static function maybe_add_permissions() {
+		}
+		return false;
+	}
+
+	/**
+	 * Make sure administrators can see Formidable menu
+	 *
+	 * @since 2.0
+	 */
+	public static function maybe_add_permissions() {
 		self::force_capability( 'frm_view_entries' );
 
-        if ( ! current_user_can('administrator') || current_user_can('frm_view_forms') ) {
-            return;
-        }
+		if ( ! current_user_can('administrator') || current_user_can('frm_view_forms') ) {
+			return;
+		}
 
 		$user_id = get_current_user_id();
 		$user = new WP_User( $user_id );
-        $frm_roles = self::frm_capabilities();
-        foreach ( $frm_roles as $frm_role => $frm_role_description ) {
+		$frm_roles = self::frm_capabilities();
+		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
 			$user->add_cap( $frm_role );
-            unset($frm_role, $frm_role_description);
-        }
-    }
+			unset($frm_role, $frm_role_description);
+		}
+	}
 
 	/**
 	 * Make sure admins have permission to see the menu items
@@ -679,28 +679,28 @@ 
 		}
 	}
 
-    /**
-     * Check if the user has permision for action.
-     * Return permission message and stop the action if no permission
-     * @since 2.0
-     * @param string $permission
-     */
+	/**
+	 * Check if the user has permision for action.
+	 * Return permission message and stop the action if no permission
+	 * @since 2.0
+	 * @param string $permission
+	 */
 	public static function permission_check( $permission, $show_message = 'show' ) {
-        $permission_error = self::permission_nonce_error($permission);
-        if ( $permission_error !== false ) {
-            if ( 'hide' == $show_message ) {
-                $permission_error = '';
-            }
-            wp_die($permission_error);
-        }
-    }
-
-    /**
-     * Check user permission and nonce
-     * @since 2.0
-     * @param string $permission
-     * @return false|string The permission message or false if allowed
-     */
+		$permission_error = self::permission_nonce_error($permission);
+		if ( $permission_error !== false ) {
+			if ( 'hide' == $show_message ) {
+				$permission_error = '';
+			}
+			wp_die($permission_error);
+		}
+	}
+
+	/**
+	 * Check user permission and nonce
+	 * @since 2.0
+	 * @param string $permission
+	 * @return false|string The permission message or false if allowed
+	 */
 	public static function permission_nonce_error( $permission, $nonce_name = '', $nonce = '' ) {
 		if ( ! empty( $permission ) && ! current_user_can( $permission ) && ! current_user_can( 'administrator' ) ) {
 			$frm_settings = self::get_settings();
@@ -708,23 +708,23 @@ 
 		}
 
 		$error = false;
-        if ( empty($nonce_name) ) {
-            return $error;
-        }
+		if ( empty($nonce_name) ) {
+			return $error;
+		}
 
-        if ( $_REQUEST && ( ! isset( $_REQUEST[ $nonce_name ] ) || ! wp_verify_nonce( $_REQUEST[ $nonce_name ], $nonce ) ) ) {
-            $frm_settings = self::get_settings();
-            $error = $frm_settings->admin_permission;
-        }
+		if ( $_REQUEST && ( ! isset( $_REQUEST[ $nonce_name ] ) || ! wp_verify_nonce( $_REQUEST[ $nonce_name ], $nonce ) ) ) {
+			$frm_settings = self::get_settings();
+			$error = $frm_settings->admin_permission;
+		}
 
-        return $error;
-    }
+		return $error;
+	}
 
-    public static function checked( $values, $current ) {
+	public static function checked( $values, $current ) {
 		if ( self::check_selected( $values, $current ) ) {
-            echo ' checked="checked"';
+			echo ' checked="checked"';
 		}
-    }
+	}
 
 	public static function check_selected( $values, $current ) {
 		$values = self::recursive_function_map( $values, 'trim' );
@@ -734,50 +734,50 @@ 
 		return ( is_array( $values ) && in_array( $current, $values ) ) || ( ! is_array( $values ) && $values == $current );
 	}
 
-    /**
-    * Check if current field option is an "other" option
-    *
-    * @since 2.0
-    *
-    * @param string $opt_key
-    * @return boolean Returns true if current field option is an "Other" option
-    */
-    public static function is_other_opt( $opt_key ) {
-        _deprecated_function( __FUNCTION__, '2.0.6', 'FrmFieldsHelper::is_other_opt' );
-        return FrmFieldsHelper::is_other_opt( $opt_key );
-    }
-
-    /**
-    * Get value that belongs in "Other" text box
-    *
-    * @since 2.0
-    *
-    * @param string $opt_key
-    * @param array $field
-    * @return string $other_val
-    */
-    public static function get_other_val( $opt_key, $field, $parent = false, $pointer = false ) {
+	/**
+	 * Check if current field option is an "other" option
+	 *
+	 * @since 2.0
+	 *
+	 * @param string $opt_key
+	 * @return boolean Returns true if current field option is an "Other" option
+	 */
+	public static function is_other_opt( $opt_key ) {
+		_deprecated_function( __FUNCTION__, '2.0.6', 'FrmFieldsHelper::is_other_opt' );
+		return FrmFieldsHelper::is_other_opt( $opt_key );
+	}
+
+	/**
+	 * Get value that belongs in "Other" text box
+	 *
+	 * @since 2.0
+	 *
+	 * @param string $opt_key
+	 * @param array $field
+	 * @return string $other_val
+	 */
+	public static function get_other_val( $opt_key, $field, $parent = false, $pointer = false ) {
 		_deprecated_function( __FUNCTION__, '2.0.6', 'FrmFieldsHelper::get_other_val' );
 		return FrmFieldsHelper::get_other_val( compact( 'opt_key', 'field', 'parent', 'pointer' ) );
-    }
-
-    /**
-    * 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
-    *
-    * @param array $field
-    * @param boolean $other_opt
-    * @param string $checked
-    * @param array $args should include opt_key and field name
-    * @return string $other_val
-    */
-    public static function prepare_other_input( $field, &$other_opt, &$checked, $args = array() ) {
+	}
+
+	/**
+	 * 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
+	 *
+	 * @param array $field
+	 * @param boolean $other_opt
+	 * @param string $checked
+	 * @param array $args should include opt_key and field name
+	 * @return string $other_val
+	 */
+	public static function prepare_other_input( $field, &$other_opt, &$checked, $args = array() ) {
 		_deprecated_function( __FUNCTION__, '2.0.6', 'FrmFieldsHelper::prepare_other_input' );
 		$args['field'] = $field;
 		return FrmFieldsHelper::prepare_other_input( $args, $other_opt, $checked );
-    }
+	}
 
 	public static function recursive_function_map( $value, $function ) {
 		if ( is_array( $value ) ) {
@@ -807,24 +807,24 @@ 
 		return (bool) count( array_filter( array_keys( $array ), 'is_string' ) );
 	}
 
-    /**
-     * Flatten a multi-dimensional array
-     */
+	/**
+	 * Flatten a multi-dimensional array
+	 */
 	public static function array_flatten( $array, $keys = 'keep' ) {
-        $return = array();
-        foreach ( $array as $key => $value ) {
-            if ( is_array($value) ) {
+		$return = array();
+		foreach ( $array as $key => $value ) {
+			if ( is_array($value) ) {
 				$return = array_merge( $return, self::array_flatten( $value, $keys ) );
-            } else {
+			} else {
 				if ( $keys == 'keep' ) {
 					$return[ $key ] = $value;
 				} else {
 					$return[] = $value;
 				}
-            }
-        }
-        return $return;
-    }
+			}
+		}
+		return $return;
+	}
 
 	public static function esc_textarea( $text, $is_rich_text = false ) {
 		$safe_text = str_replace( '&quot;', '"', $text );
@@ -835,308 +835,308 @@ 
 		return apply_filters( 'esc_textarea', $safe_text, $text );
 	}
 
-    /**
-     * Add auto paragraphs to text areas
-     * @since 2.0
-     */
+	/**
+	 * Add auto paragraphs to text areas
+	 * @since 2.0
+	 */
 	public static function use_wpautop( $content ) {
-        if ( apply_filters('frm_use_wpautop', true) ) {
-            $content = wpautop(str_replace( '<br>', '<br />', $content));
-        }
-        return $content;
-    }
+		if ( apply_filters('frm_use_wpautop', true) ) {
+			$content = wpautop(str_replace( '<br>', '<br />', $content));
+		}
+		return $content;
+	}
 
 	public static function replace_quotes( $val ) {
-        //Replace double quotes
+		//Replace double quotes
 		$val = str_replace( array( '&#8220;', '&#8221;', '&#8243;' ), '"', $val );
-        //Replace single quotes
-        $val = str_replace( array( '&#8216;', '&#8217;', '&#8242;', '&prime;', '&rsquo;', '&lsquo;' ), "'", $val );
-        return $val;
-    }
-
-    /**
-     * @since 2.0
-     * @return string The base Google APIS url for the current version of jQuery UI
-     */
-    public static function jquery_ui_base_url() {
+		//Replace single quotes
+		$val = str_replace( array( '&#8216;', '&#8217;', '&#8242;', '&prime;', '&rsquo;', '&lsquo;' ), "'", $val );
+		return $val;
+	}
+
+	/**
+	 * @since 2.0
+	 * @return string The base Google APIS url for the current version of jQuery UI
+	 */
+	public static function jquery_ui_base_url() {
 		$url = 'http' . ( is_ssl() ? 's' : '' ) . '://ajax.googleapis.com/ajax/libs/jqueryui/' . self::script_version('jquery-ui-core');
-        $url = apply_filters('frm_jquery_ui_base_url', $url);
-        return $url;
-    }
+		$url = apply_filters('frm_jquery_ui_base_url', $url);
+		return $url;
+	}
 
-    /**
-     * @param string $handle
-     */
+	/**
+	 * @param string $handle
+	 */
 	public static function script_version( $handle ) {
-        global $wp_scripts;
-    	if ( ! $wp_scripts ) {
-    	    return false;
-    	}
+		global $wp_scripts;
+		if ( ! $wp_scripts ) {
+			return false;
+		}
 
-        $ver = 0;
+		$ver = 0;
 
-        if ( ! isset( $wp_scripts->registered[ $handle ] ) ) {
-            return $ver;
-        }
+		if ( ! isset( $wp_scripts->registered[ $handle ] ) ) {
+			return $ver;
+		}
 
-        $query = $wp_scripts->registered[ $handle ];
-    	if ( is_object( $query ) ) {
-    	    $ver = $query->ver;
-    	}
+		$query = $wp_scripts->registered[ $handle ];
+		if ( is_object( $query ) ) {
+			$ver = $query->ver;
+		}
 
-    	return $ver;
-    }
+		return $ver;
+	}
 
 	public static function js_redirect( $url ) {
 		return '<script type="text/javascript">window.location="' . esc_url_raw( $url ) . '"</script>';
-    }
+	}
 
 	public static function get_user_id_param( $user_id ) {
-        if ( ! $user_id || empty($user_id) || is_numeric($user_id) ) {
-            return $user_id;
-        }
+		if ( ! $user_id || empty($user_id) || is_numeric($user_id) ) {
+			return $user_id;
+		}
 
 		if ( $user_id == 'current' ) {
 			$user_id = get_current_user_id();
 		} else {
-            if ( is_email($user_id) ) {
-                $user = get_user_by('email', $user_id);
-            } else {
-                $user = get_user_by('login', $user_id);
-            }
+			if ( is_email($user_id) ) {
+				$user = get_user_by('email', $user_id);
+			} else {
+				$user = get_user_by('login', $user_id);
+			}
 
-            if ( $user ) {
-                $user_id = $user->ID;
-            }
-            unset($user);
-        }
+			if ( $user ) {
+				$user_id = $user->ID;
+			}
+			unset($user);
+		}
 
-        return $user_id;
-    }
+		return $user_id;
+	}
 
 	public static function get_file_contents( $filename, $atts = array() ) {
-        if ( ! is_file($filename) ) {
-            return false;
-        }
-
-        extract($atts);
-        ob_start();
-        include($filename);
-        $contents = ob_get_contents();
-        ob_end_clean();
-        return $contents;
-    }
-
-    /**
-     * @param string $table_name
-     * @param string $column
+		if ( ! is_file($filename) ) {
+			return false;
+		}
+
+		extract($atts);
+		ob_start();
+		include($filename);
+		$contents = ob_get_contents();
+		ob_end_clean();
+		return $contents;
+	}
+
+	/**
+	 * @param string $table_name
+	 * @param string $column
 	 * @param int $id
 	 * @param int $num_chars
-     */
-    public static function get_unique_key( $name = '', $table_name, $column, $id = 0, $num_chars = 5 ) {
-        $key = '';
+	 */
+	public static function get_unique_key( $name = '', $table_name, $column, $id = 0, $num_chars = 5 ) {
+		$key = '';
 
-        if ( ! empty( $name ) ) {
-            $key = sanitize_key($name);
-        }
+		if ( ! empty( $name ) ) {
+			$key = sanitize_key($name);
+		}
 
 		if ( empty( $key ) ) {
-            $max_slug_value = pow(36, $num_chars);
-            $min_slug_value = 37; // we want to have at least 2 characters in the slug
-            $key = base_convert( rand($min_slug_value, $max_slug_value), 10, 36 );
-        }
+			$max_slug_value = pow(36, $num_chars);
+			$min_slug_value = 37; // we want to have at least 2 characters in the slug
+			$key = base_convert( rand($min_slug_value, $max_slug_value), 10, 36 );
+		}
 
 		if ( is_numeric($key) || in_array( $key, array( 'id', 'key', 'created-at', 'detaillink', 'editlink', 'siteurl', 'evenodd' ) ) ) {
 			$key = $key . 'a';
-        }
+		}
 
 		$key_check = FrmDb::get_var( $table_name, array( $column => $key, 'ID !' => $id ), $column );
 
-        if ( $key_check || is_numeric($key_check) ) {
-            $suffix = 2;
+		if ( $key_check || is_numeric($key_check) ) {
+			$suffix = 2;
 			do {
 				$alt_post_name = substr( $key, 0, 200 - ( strlen( $suffix ) + 1 ) ) . $suffix;
 				$key_check = FrmDb::get_var( $table_name, array( $column => $alt_post_name, 'ID !' => $id ), $column );
 				$suffix++;
 			} while ($key_check || is_numeric($key_check));
 			$key = $alt_post_name;
-        }
-        return $key;
-    }
-
-    /**
-     * Editing a Form or Entry
-     * @param string $table
-     * @return bool|array
-     */
-    public static function setup_edit_vars( $record, $table, $fields = '', $default = false, $post_values = array(), $args = array() ) {
-        if ( ! $record ) {
-            return false;
-        }
-
-        if ( empty($post_values) ) {
-            $post_values = stripslashes_deep($_POST);
-        }
+		}
+		return $key;
+	}
+
+	/**
+	 * Editing a Form or Entry
+	 * @param string $table
+	 * @return bool|array
+	 */
+	public static function setup_edit_vars( $record, $table, $fields = '', $default = false, $post_values = array(), $args = array() ) {
+		if ( ! $record ) {
+			return false;
+		}
+
+		if ( empty($post_values) ) {
+			$post_values = stripslashes_deep($_POST);
+		}
 
 		$values = array( 'id' => $record->id, 'fields' => array() );
 
 		foreach ( array( 'name', 'description' ) as $var ) {
-            $default_val = isset($record->{$var}) ? $record->{$var} : '';
+			$default_val = isset($record->{$var}) ? $record->{$var} : '';
 			$values[ $var ] = self::get_param( $var, $default_val, 'get', 'wp_kses_post' );
-            unset($var, $default_val);
-        }
-
-        $values['description'] = self::use_wpautop($values['description']);
-        $frm_settings = self::get_settings();
-        $is_form_builder = self::is_admin_page('formidable' );
-
-        foreach ( (array) $fields as $field ) {
-            // Make sure to filter default values (for placeholder text), but not on the form builder page
-            if ( ! $is_form_builder ) {
-                $field->default_value = apply_filters('frm_get_default_value', $field->default_value, $field, true );
-            }
+			unset($var, $default_val);
+		}
+
+		$values['description'] = self::use_wpautop($values['description']);
+		$frm_settings = self::get_settings();
+		$is_form_builder = self::is_admin_page('formidable' );
+
+		foreach ( (array) $fields as $field ) {
+			// Make sure to filter default values (for placeholder text), but not on the form builder page
+			if ( ! $is_form_builder ) {
+				$field->default_value = apply_filters('frm_get_default_value', $field->default_value, $field, true );
+			}
 			$parent_form_id = isset( $args['parent_form_id'] ) ? $args['parent_form_id'] : $field->form_id;
 			self::fill_field_defaults($field, $record, $values, compact('default', 'post_values', 'frm_settings', 'parent_form_id' ) );
-        }
+		}
 
-        self::fill_form_opts($record, $table, $post_values, $values);
+		self::fill_form_opts($record, $table, $post_values, $values);
 
-        if ( $table == 'entries' ) {
-            $values = FrmEntriesHelper::setup_edit_vars( $values, $record );
-        } else if ( $table == 'forms' ) {
-            $values = FrmFormsHelper::setup_edit_vars( $values, $record, $post_values );
-        }
+		if ( $table == 'entries' ) {
+			$values = FrmEntriesHelper::setup_edit_vars( $values, $record );
+		} else if ( $table == 'forms' ) {
+			$values = FrmFormsHelper::setup_edit_vars( $values, $record, $post_values );
+		}
 
-        return $values;
-    }
+		return $values;
+	}
 
 	private static function fill_field_defaults( $field, $record, array &$values, $args ) {
-        $post_values = $args['post_values'];
-
-        if ( $args['default'] ) {
-            $meta_value = $field->default_value;
-        } else {
-            if ( $record->post_id && self::pro_is_installed() && isset($field->field_options['post_field']) && $field->field_options['post_field'] ) {
-                if ( ! isset($field->field_options['custom_field']) ) {
-                    $field->field_options['custom_field'] = '';
-                }
+		$post_values = $args['post_values'];
+
+		if ( $args['default'] ) {
+			$meta_value = $field->default_value;
+		} else {
+			if ( $record->post_id && self::pro_is_installed() && isset($field->field_options['post_field']) && $field->field_options['post_field'] ) {
+				if ( ! isset($field->field_options['custom_field']) ) {
+					$field->field_options['custom_field'] = '';
+				}
 				$meta_value = FrmProEntryMetaHelper::get_post_value( $record->post_id, $field->field_options['post_field'], $field->field_options['custom_field'], array( 'truncate' => false, 'type' => $field->type, 'form_id' => $field->form_id, 'field' => $field ) );
-            } else {
+			} else {
 				$meta_value = FrmEntryMeta::get_meta_value( $record, $field->id );
-            }
-        }
+			}
+		}
 
 		$field_type = isset( $post_values['field_options'][ 'type_' . $field->id ] ) ? $post_values['field_options'][ 'type_' . $field->id ] : $field->type;
-        $new_value = isset( $post_values['item_meta'][ $field->id ] ) ? maybe_unserialize( $post_values['item_meta'][ $field->id ] ) : $meta_value;
-
-        $field_array = array(
-            'id'            => $field->id,
-            'value'         => $new_value,
-            'default_value' => $field->default_value,
-            'name'          => $field->name,
-            'description'   => $field->description,
-            'type'          => apply_filters('frm_field_type', $field_type, $field, $new_value),
-            'options'       => $field->options,
-            'required'      => $field->required,
-            'field_key'     => $field->field_key,
-            'field_order'   => $field->field_order,
-            'form_id'       => $field->form_id,
+		$new_value = isset( $post_values['item_meta'][ $field->id ] ) ? maybe_unserialize( $post_values['item_meta'][ $field->id ] ) : $meta_value;
+
+		$field_array = array(
+			'id'            => $field->id,
+			'value'         => $new_value,
+			'default_value' => $field->default_value,
+			'name'          => $field->name,
+			'description'   => $field->description,
+			'type'          => apply_filters('frm_field_type', $field_type, $field, $new_value),
+			'options'       => $field->options,
+			'required'      => $field->required,
+			'field_key'     => $field->field_key,
+			'field_order'   => $field->field_order,
+			'form_id'       => $field->form_id,
 			'parent_form_id' => $args['parent_form_id'],
-        );
+		);
 
-        $args['field_type'] = $field_type;
-        self::fill_field_opts($field, $field_array, $args);
+		$args['field_type'] = $field_type;
+		self::fill_field_opts($field, $field_array, $args);
 		// Track the original field's type
 		$field_array['original_type'] = isset( $field->field_options['original_type'] ) ? $field->field_options['original_type'] : $field->type;
 
-        $field_array = apply_filters( 'frm_setup_edit_fields_vars', $field_array, $field, $values['id'], array() );
+		$field_array = apply_filters( 'frm_setup_edit_fields_vars', $field_array, $field, $values['id'], array() );
 
-        if ( ! isset($field_array['unique']) || ! $field_array['unique'] ) {
-            $field_array['unique_msg'] = '';
-        }
+		if ( ! isset($field_array['unique']) || ! $field_array['unique'] ) {
+			$field_array['unique_msg'] = '';
+		}
 
-        $field_array = array_merge( $field->field_options, $field_array );
+		$field_array = array_merge( $field->field_options, $field_array );
 
-        $values['fields'][ $field->id ] = $field_array;
-    }
+		$values['fields'][ $field->id ] = $field_array;
+	}
 
 	private static function fill_field_opts( $field, array &$field_array, $args ) {
-        $post_values = $args['post_values'];
-        $opt_defaults = FrmFieldsHelper::get_default_field_opts($field_array['type'], $field, true);
+		$post_values = $args['post_values'];
+		$opt_defaults = FrmFieldsHelper::get_default_field_opts($field_array['type'], $field, true);
 
-        foreach ( $opt_defaults as $opt => $default_opt ) {
+		foreach ( $opt_defaults as $opt => $default_opt ) {
 			$field_array[ $opt ] = ( $post_values && isset( $post_values['field_options'][ $opt . '_' . $field->id ] ) ) ? maybe_unserialize( $post_values['field_options'][ $opt . '_' . $field->id ] ) : ( isset( $field->field_options[ $opt ] ) ? $field->field_options[ $opt ] : $default_opt );
-            if ( $opt == 'blank' && $field_array[ $opt ] == '' ) {
-                $field_array[ $opt ] = $args['frm_settings']->blank_msg;
-            } else if ( $opt == 'invalid' && $field_array[ $opt ] == '' ) {
-                if ( $args['field_type'] == 'captcha' ) {
-                    $field_array[ $opt ] = $args['frm_settings']->re_msg;
-                } else {
-                    $field_array[ $opt ] = sprintf( __( '%s is invalid', 'formidable' ), $field_array['name'] );
-                }
-            }
-        }
-
-        if ( $field_array['custom_html'] == '' ) {
-            $field_array['custom_html'] = FrmFieldsHelper::get_default_html($args['field_type']);
-        }
-    }
-
-    /**
-     * @param string $table
-     */
+			if ( $opt == 'blank' && $field_array[ $opt ] == '' ) {
+				$field_array[ $opt ] = $args['frm_settings']->blank_msg;
+			} else if ( $opt == 'invalid' && $field_array[ $opt ] == '' ) {
+				if ( $args['field_type'] == 'captcha' ) {
+					$field_array[ $opt ] = $args['frm_settings']->re_msg;
+				} else {
+					$field_array[ $opt ] = sprintf( __( '%s is invalid', 'formidable' ), $field_array['name'] );
+				}
+			}
+		}
+
+		if ( $field_array['custom_html'] == '' ) {
+			$field_array['custom_html'] = FrmFieldsHelper::get_default_html($args['field_type']);
+		}
+	}
+
+	/**
+	 * @param string $table
+	 */
 	private static function fill_form_opts( $record, $table, $post_values, array &$values ) {
-        if ( $table == 'entries' ) {
-            $form = $record->form_id;
+		if ( $table == 'entries' ) {
+			$form = $record->form_id;
 			FrmForm::maybe_get_form( $form );
-        } else {
-            $form = $record;
-        }
+		} else {
+			$form = $record;
+		}
 
-        if ( ! $form ) {
-            return;
-        }
+		if ( ! $form ) {
+			return;
+		}
 
-        $values['form_name'] = isset($record->form_id) ? $form->name : '';
+		$values['form_name'] = isset($record->form_id) ? $form->name : '';
 		$values['parent_form_id'] = isset( $record->form_id ) ? $form->parent_form_id : 0;
 
-        if ( ! is_array($form->options) ) {
-            return;
-        }
+		if ( ! is_array($form->options) ) {
+			return;
+		}
 
-        foreach ( $form->options as $opt => $value ) {
-            $values[ $opt ] = isset( $post_values[ $opt ] ) ? maybe_unserialize( $post_values[ $opt ] ) : $value;
-        }
+		foreach ( $form->options as $opt => $value ) {
+			$values[ $opt ] = isset( $post_values[ $opt ] ) ? maybe_unserialize( $post_values[ $opt ] ) : $value;
+		}
 
-        self::fill_form_defaults($post_values, $values);
-    }
+		self::fill_form_defaults($post_values, $values);
+	}
 
-    /**
-     * Set to POST value or default
-     */
+	/**
+	 * Set to POST value or default
+	 */
 	private static function fill_form_defaults( $post_values, array &$values ) {
-        $form_defaults = FrmFormsHelper::get_default_opts();
+		$form_defaults = FrmFormsHelper::get_default_opts();
 
-        foreach ( $form_defaults as $opt => $default ) {
-            if ( ! isset( $values[ $opt ] ) || $values[ $opt ] == '' ) {
+		foreach ( $form_defaults as $opt => $default ) {
+			if ( ! isset( $values[ $opt ] ) || $values[ $opt ] == '' ) {
 				$values[ $opt ] = ( $post_values && isset( $post_values['options'][ $opt ] ) ) ? $post_values['options'][ $opt ] : $default;
-            }
+			}
 
-            unset($opt, $defaut);
-        }
+			unset($opt, $defaut);
+		}
 
-        if ( ! isset($values['custom_style']) ) {
-            $frm_settings = self::get_settings();
+		if ( ! isset($values['custom_style']) ) {
+			$frm_settings = self::get_settings();
 			$values['custom_style'] = ( $post_values && isset( $post_values['options']['custom_style'] ) ) ? absint( $_POST['options']['custom_style'] ) : ( $frm_settings->load_style != 'none' );
-        }
+		}
 
 		foreach ( array( 'before', 'after', 'submit' ) as $h ) {
 			if ( ! isset( $values[ $h . '_html' ] ) ) {
 				$values[ $h . '_html' ] = ( isset( $post_values['options'][ $h . '_html' ] ) ? $post_values['options'][ $h . '_html' ] : FrmFormsHelper::get_default_html( $h ) );
-            }
-            unset($h);
-        }
-    }
+			}
+			unset($h);
+		}
+	}
 
 	public static function get_meta_value( $field_id, $entry ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmEntryMeta::get_meta_value' );
@@ -1144,59 +1144,59 @@ 
 	}
 
 	public static function insert_opt_html( $args ) {
-        $class = '';
-        if ( in_array( $args['type'], array( 'email', 'user_id', 'hidden', 'select', 'radio', 'checkbox', 'phone', 'text' ) ) ) {
-            $class .= 'show_frm_not_email_to';
-        }
-    ?>
+		$class = '';
+		if ( in_array( $args['type'], array( 'email', 'user_id', 'hidden', 'select', 'radio', 'checkbox', 'phone', 'text' ) ) ) {
+			$class .= 'show_frm_not_email_to';
+		}
+	?>
 <li>
     <a href="javascript:void(0)" class="frmids frm_insert_code alignright <?php echo esc_attr($class) ?>" data-code="<?php echo esc_attr($args['id']) ?>" >[<?php echo esc_attr( $args['id'] ) ?>]</a>
     <a href="javascript:void(0)" class="frmkeys frm_insert_code alignright <?php echo esc_attr($class) ?>" data-code="<?php echo esc_attr($args['key']) ?>" >[<?php echo esc_attr( self::truncate($args['key'], 10) ) ?>]</a>
     <a href="javascript:void(0)" class="frm_insert_code <?php echo esc_attr( $class ) ?>" data-code="<?php echo esc_attr($args['id']) ?>" ><?php echo esc_attr( self::truncate($args['name'], 60) ) ?></a>
 </li>
     <?php
-    }
+	}
 
 	public static function truncate( $str, $length, $minword = 3, $continue = '...' ) {
-        if ( is_array( $str ) ) {
-            return '';
+		if ( is_array( $str ) ) {
+			return '';
 		}
 
-        $length = (int) $length;
+		$length = (int) $length;
 		$str = wp_strip_all_tags( $str );
 		$original_len = self::mb_function( array( 'mb_strlen', 'strlen' ), array( $str ) );
 
 		if ( $length == 0 ) {
-            return '';
-        } else if ( $length <= 10 ) {
+			return '';
+		} else if ( $length <= 10 ) {
 			$sub = self::mb_function( array( 'mb_substr', 'substr' ), array( $str, 0, $length ) );
-            return $sub . (($length < $original_len) ? $continue : '');
-        }
+			return $sub . (($length < $original_len) ? $continue : '');
+		}
 
-        $sub = '';
-        $len = 0;
+		$sub = '';
+		$len = 0;
 
 		$words = self::mb_function( array( 'mb_split', 'explode' ), array( ' ', $str ) );
 
 		foreach ( $words as $word ) {
-            $part = (($sub != '') ? ' ' : '') . $word;
+			$part = (($sub != '') ? ' ' : '') . $word;
 			$total_len = self::mb_function( array( 'mb_strlen', 'strlen' ), array( $sub . $part ) );
-            if ( $total_len > $length && str_word_count($sub) ) {
-                break;
-            }
+			if ( $total_len > $length && str_word_count($sub) ) {
+				break;
+			}
 
-            $sub .= $part;
+			$sub .= $part;
 			$len += self::mb_function( array( 'mb_strlen', 'strlen' ), array( $part ) );
 
-            if ( str_word_count($sub) > $minword && $total_len >= $length ) {
-                break;
-            }
+			if ( str_word_count($sub) > $minword && $total_len >= $length ) {
+				break;
+			}
 
-            unset($total_len, $word);
-        }
+			unset($total_len, $word);
+		}
 
-        return $sub . (($len < $original_len) ? $continue : '');
-    }
+		return $sub . (($len < $original_len) ? $continue : '');
+	}
 
 	public static function mb_function( $function_names, $args ) {
 		$mb_function_name = $function_names[0];
@@ -1208,18 +1208,18 @@ 
 	}
 
 	public static function get_formatted_time( $date, $date_format = '', $time_format = '' ) {
-        if ( empty($date) ) {
-            return $date;
-        }
+		if ( empty($date) ) {
+			return $date;
+		}
 
-        if ( empty($date_format) ) {
-            $date_format = get_option('date_format');
-        }
+		if ( empty($date_format) ) {
+			$date_format = get_option('date_format');
+		}
 
-        if ( preg_match('/^\d{1-2}\/\d{1-2}\/\d{4}$/', $date) && self::pro_is_installed() ) {
-            $frmpro_settings = new FrmProSettings();
-            $date = FrmProAppHelper::convert_date($date, $frmpro_settings->date_format, 'Y-m-d');
-        }
+		if ( preg_match('/^\d{1-2}\/\d{1-2}\/\d{4}$/', $date) && self::pro_is_installed() ) {
+			$frmpro_settings = new FrmProSettings();
+			$date = FrmProAppHelper::convert_date($date, $frmpro_settings->date_format, 'Y-m-d');
+		}
 
 		$formatted = self::get_localized_date( $date_format, $date );
 
@@ -1228,8 +1228,8 @@ 
 			$formatted .= self::add_time_to_date( $time_format, $date );
 		}
 
-        return $formatted;
-    }
+		return $formatted;
+	}
 
 	private static function add_time_to_date( $time_format, $date ) {
 		if ( empty( $time_format ) ) {
@@ -1310,61 +1310,61 @@ 
 		);
 	}
 
-    /**
-     * Added for < WP 4.0 compatability
-     *
-     * @since 1.07.10
-     *
-     * @param string $term The value to escape
-     * @return string The escaped value
-     */
+	/**
+	 * Added for < WP 4.0 compatability
+	 *
+	 * @since 1.07.10
+	 *
+	 * @param string $term The value to escape
+	 * @return string The escaped value
+	 */
 	public static function esc_like( $term ) {
-        global $wpdb;
-        if ( method_exists($wpdb, 'esc_like') ) {
+		global $wpdb;
+		if ( method_exists($wpdb, 'esc_like') ) {
 			// WP 4.0
-            $term = $wpdb->esc_like( $term );
-        } else {
-            $term = like_escape( $term );
-        }
+			$term = $wpdb->esc_like( $term );
+		} else {
+			$term = like_escape( $term );
+		}
 
-        return $term;
-    }
+		return $term;
+	}
 
-    /**
-     * @param string $order_query
-     */
+	/**
+	 * @param string $order_query
+	 */
 	public static function esc_order( $order_query ) {
-        if ( empty($order_query) ) {
-            return '';
-        }
-
-        // remove ORDER BY before santizing
-        $order_query = strtolower($order_query);
-        if ( strpos($order_query, 'order by') !== false ) {
-            $order_query = str_replace('order by', '', $order_query);
-        }
-
-        $order_query = explode(' ', trim($order_query));
-
-        $order_fields = array(
-            'id', 'form_key', 'name', 'description',
-            'parent_form_id', 'logged_in', 'is_template',
-            'default_template', 'status', 'created_at',
-        );
-
-        $order = trim(trim(reset($order_query), ','));
-        if ( ! in_array($order, $order_fields) ) {
-            return '';
-        }
-
-        $order_by = '';
-        if ( count($order_query) > 1 ) {
+		if ( empty($order_query) ) {
+			return '';
+		}
+
+		// remove ORDER BY before santizing
+		$order_query = strtolower($order_query);
+		if ( strpos($order_query, 'order by') !== false ) {
+			$order_query = str_replace('order by', '', $order_query);
+		}
+
+		$order_query = explode(' ', trim($order_query));
+
+		$order_fields = array(
+			'id', 'form_key', 'name', 'description',
+			'parent_form_id', 'logged_in', 'is_template',
+			'default_template', 'status', 'created_at',
+		);
+
+		$order = trim(trim(reset($order_query), ','));
+		if ( ! in_array($order, $order_fields) ) {
+			return '';
+		}
+
+		$order_by = '';
+		if ( count($order_query) > 1 ) {
 			$order_by = end( $order_query );
 			self::esc_order_by( $order_by );
-        }
+		}
 
 		return ' ORDER BY ' . $order . ' ' . $order_by;
-    }
+	}
 
 	/**
 	 * Make sure this is ordering by either ASC or DESC
@@ -1376,169 +1376,169 @@ 
 		}
 	}
 
-    /**
-     * @param string $limit
-     */
+	/**
+	 * @param string $limit
+	 */
 	public static function esc_limit( $limit ) {
-        if ( empty($limit) ) {
-            return '';
-        }
+		if ( empty($limit) ) {
+			return '';
+		}
 
-        $limit = trim(str_replace(' limit', '', strtolower($limit)));
-        if ( is_numeric($limit) ) {
+		$limit = trim(str_replace(' limit', '', strtolower($limit)));
+		if ( is_numeric($limit) ) {
 			return ' LIMIT ' . $limit;
-        }
+		}
 
-        $limit = explode(',', trim($limit));
-        foreach ( $limit as $k => $l ) {
-            if ( is_numeric( $l ) ) {
-                $limit[ $k ] = $l;
-            }
-        }
+		$limit = explode(',', trim($limit));
+		foreach ( $limit as $k => $l ) {
+			if ( is_numeric( $l ) ) {
+				$limit[ $k ] = $l;
+			}
+		}
 
-        $limit = implode(',', $limit);
+		$limit = implode(',', $limit);
 		return ' LIMIT ' . $limit;
-    }
-
-    /**
-     * Get an array of values ready to go through $wpdb->prepare
-     * @since 2.0
-     */
-    public static function prepare_array_values( $array, $type = '%s' ) {
-        $placeholders = array_fill(0, count($array), $type);
-        return implode(', ', $placeholders);
-    }
-
-    public static function prepend_and_or_where( $starts_with = ' WHERE ', $where = '' ) {
-        if ( empty($where) ) {
-            return '';
-        }
+	}
+
+	/**
+	 * Get an array of values ready to go through $wpdb->prepare
+	 * @since 2.0
+	 */
+	public static function prepare_array_values( $array, $type = '%s' ) {
+		$placeholders = array_fill(0, count($array), $type);
+		return implode(', ', $placeholders);
+	}
+
+	public static function prepend_and_or_where( $starts_with = ' WHERE ', $where = '' ) {
+		if ( empty($where) ) {
+			return '';
+		}
 
 		if ( is_array( $where ) ) {
-            global $wpdb;
-            FrmDb::get_where_clause_and_values( $where, $starts_with );
+			global $wpdb;
+			FrmDb::get_where_clause_and_values( $where, $starts_with );
 			$where = $wpdb->prepare( $where['where'], $where['values'] );
 		} else {
-            $where = $starts_with . $where;
-        }
+			$where = $starts_with . $where;
+		}
 
-        return $where;
-    }
+		return $where;
+	}
 
-    // Pagination Methods
+	// Pagination Methods
 
-    /**
-     * @param integer $current_p
-     */
+	/**
+	 * @param integer $current_p
+	 */
 	public static function get_last_record_num( $r_count, $current_p, $p_size ) {
 		return ( ( $r_count < ( $current_p * $p_size ) ) ? $r_count : ( $current_p * $p_size ) );
 	}
 
-    /**
-     * @param integer $current_p
-     */
-    public static function get_first_record_num( $r_count, $current_p, $p_size ) {
-        if ( $current_p == 1 ) {
-            return 1;
-        } else {
-            return ( self::get_last_record_num( $r_count, ( $current_p - 1 ), $p_size ) + 1 );
-        }
-    }
+	/**
+	 * @param integer $current_p
+	 */
+	public static function get_first_record_num( $r_count, $current_p, $p_size ) {
+		if ( $current_p == 1 ) {
+			return 1;
+		} else {
+			return ( self::get_last_record_num( $r_count, ( $current_p - 1 ), $p_size ) + 1 );
+		}
+	}
 
 	/**
 	 * @return array
 	 */
 	public static function json_to_array( $json_vars ) {
-        $vars = array();
-        foreach ( $json_vars as $jv ) {
-            $jv_name = explode('[', $jv['name']);
-            $last = count($jv_name) - 1;
-            foreach ( $jv_name as $p => $n ) {
-                $name = trim($n, ']');
-                if ( ! isset($l1) ) {
-                    $l1 = $name;
-                }
-
-                if ( ! isset($l2) ) {
-                    $l2 = $name;
-                }
-
-                if ( ! isset($l3) ) {
-                    $l3 = $name;
-                }
-
-                $this_val = ( $p == $last ) ? $jv['value'] : array();
-
-                switch ( $p ) {
-                    case 0:
-                        $l1 = $name;
-                        self::add_value_to_array( $name, $l1, $this_val, $vars );
-                    break;
-
-                    case 1:
-                        $l2 = $name;
-                        self::add_value_to_array( $name, $l2, $this_val, $vars[ $l1 ] );
-                    break;
-
-                    case 2:
-                        $l3 = $name;
-                        self::add_value_to_array( $name, $l3, $this_val, $vars[ $l1 ][ $l2 ] );
-                    break;
-
-                    case 3:
-                        $l4 = $name;
-                        self::add_value_to_array( $name, $l4, $this_val, $vars[ $l1 ][ $l2 ][ $l3 ] );
-                    break;
-                }
-
-                unset($this_val, $n);
-            }
-
-            unset($last, $jv);
-        }
-
-        return $vars;
-    }
-
-    /**
-     * @param string $name
-     * @param string $l1
-     */
-    public static function add_value_to_array( $name, $l1, $val, &$vars ) {
-        if ( $name == '' ) {
-            $vars[] = $val;
-        } else if ( ! isset( $vars[ $l1 ] ) ) {
-            $vars[ $l1 ] = $val;
-        }
-    }
+		$vars = array();
+		foreach ( $json_vars as $jv ) {
+			$jv_name = explode('[', $jv['name']);
+			$last = count($jv_name) - 1;
+			foreach ( $jv_name as $p => $n ) {
+				$name = trim($n, ']');
+				if ( ! isset($l1) ) {
+					$l1 = $name;
+				}
+
+				if ( ! isset($l2) ) {
+					$l2 = $name;
+				}
+
+				if ( ! isset($l3) ) {
+					$l3 = $name;
+				}
+
+				$this_val = ( $p == $last ) ? $jv['value'] : array();
+
+				switch ( $p ) {
+					case 0:
+						$l1 = $name;
+						self::add_value_to_array( $name, $l1, $this_val, $vars );
+					break;
+
+					case 1:
+						$l2 = $name;
+						self::add_value_to_array( $name, $l2, $this_val, $vars[ $l1 ] );
+					break;
+
+					case 2:
+						$l3 = $name;
+						self::add_value_to_array( $name, $l3, $this_val, $vars[ $l1 ][ $l2 ] );
+					break;
+
+					case 3:
+						$l4 = $name;
+						self::add_value_to_array( $name, $l4, $this_val, $vars[ $l1 ][ $l2 ][ $l3 ] );
+					break;
+				}
+
+				unset($this_val, $n);
+			}
+
+			unset($last, $jv);
+		}
+
+		return $vars;
+	}
+
+	/**
+	 * @param string $name
+	 * @param string $l1
+	 */
+	public static function add_value_to_array( $name, $l1, $val, &$vars ) {
+		if ( $name == '' ) {
+			$vars[] = $val;
+		} else if ( ! isset( $vars[ $l1 ] ) ) {
+			$vars[ $l1 ] = $val;
+		}
+	}
 
 	public static function maybe_add_tooltip( $name, $class = 'closed', $form_name = '' ) {
-        $tooltips = array(
-            'action_title'  => __( 'Give this action a label for easy reference.', 'formidable' ),
-            'email_to'      => __( 'Add one or more recipient addresses separated by a ",".  FORMAT: Name <name@email.com> or name@email.com.  [admin_email] is the address set in WP General Settings.', 'formidable' ),
-            'cc'            => __( 'Add CC addresses separated by a ",".  FORMAT: Name <name@email.com> or name@email.com.', 'formidable' ),
-            'bcc'           => __( 'Add BCC addresses separated by a ",".  FORMAT: Name <name@email.com> or name@email.com.', 'formidable' ),
-            'reply_to'      => __( 'If you would like a different reply to address than the "from" address, add a single address here.  FORMAT: Name <name@email.com> or name@email.com.', 'formidable' ),
-            'from'          => __( 'Enter the name and/or email address of the sender. FORMAT: John Bates <john@example.com> or john@example.com.', 'formidable' ),
-            'email_subject' => esc_attr( sprintf( __( 'If you leave the subject blank, the default will be used: %1$s Form submitted on %2$s', 'formidable' ), $form_name, self::site_name() ) ),
-        );
-
-        if ( ! isset( $tooltips[ $name ] ) ) {
-            return;
-        }
-
-        if ( 'open' == $class ) {
-            echo ' frm_help"';
-        } else {
-            echo ' class="frm_help"';
-        }
+		$tooltips = array(
+			'action_title'  => __( 'Give this action a label for easy reference.', 'formidable' ),
+			'email_to'      => __( 'Add one or more recipient addresses separated by a ",".  FORMAT: Name <name@email.com> or name@email.com.  [admin_email] is the address set in WP General Settings.', 'formidable' ),
+			'cc'            => __( 'Add CC addresses separated by a ",".  FORMAT: Name <name@email.com> or name@email.com.', 'formidable' ),
+			'bcc'           => __( 'Add BCC addresses separated by a ",".  FORMAT: Name <name@email.com> or name@email.com.', 'formidable' ),
+			'reply_to'      => __( 'If you would like a different reply to address than the "from" address, add a single address here.  FORMAT: Name <name@email.com> or name@email.com.', 'formidable' ),
+			'from'          => __( 'Enter the name and/or email address of the sender. FORMAT: John Bates <john@example.com> or john@example.com.', 'formidable' ),
+			'email_subject' => esc_attr( sprintf( __( 'If you leave the subject blank, the default will be used: %1$s Form submitted on %2$s', 'formidable' ), $form_name, self::site_name() ) ),
+		);
+
+		if ( ! isset( $tooltips[ $name ] ) ) {
+			return;
+		}
+
+		if ( 'open' == $class ) {
+			echo ' frm_help"';
+		} else {
+			echo ' class="frm_help"';
+		}
 
 		echo ' title="' . esc_attr( $tooltips[ $name ] );
 
-        if ( 'open' != $class ) {
-            echo '"';
-        }
-    }
+		if ( 'open' != $class ) {
+			echo '"';
+		}
+	}
 
 	/**
 	 * Add the current_page class to that page in the form nav
@@ -1554,35 +1554,35 @@ 
 		}
 	}
 
-    /**
-     * Prepare and json_encode post content
-     *
-     * @since 2.0
-     *
-     * @param array $post_content
-     * @return string $post_content ( json encoded array )
-     */
-    public static function prepare_and_encode( $post_content ) {
-        //Loop through array to strip slashes and add only the needed ones
+	/**
+	 * Prepare and json_encode post content
+	 *
+	 * @since 2.0
+	 *
+	 * @param array $post_content
+	 * @return string $post_content ( json encoded array )
+	 */
+	public static function prepare_and_encode( $post_content ) {
+		//Loop through array to strip slashes and add only the needed ones
 		foreach ( $post_content as $key => $val ) {
 			// Replace problematic characters (like &quot;)
 			$val = str_replace( '&quot;', '"', $val );
 
 			self::prepare_action_slashes( $val, $key, $post_content );
-            unset( $key, $val );
-        }
+			unset( $key, $val );
+		}
 
-        // json_encode the array
-        $post_content = json_encode( $post_content );
+		// json_encode the array
+		$post_content = json_encode( $post_content );
 
-	    // add extra slashes for \r\n since WP strips them
+		// add extra slashes for \r\n since WP strips them
 		$post_content = str_replace( array( '\\r', '\\n', '\\u', '\\t' ), array( '\\\\r', '\\\\n', '\\\\u', '\\\\t' ), $post_content );
 
-        // allow for &quot
-	    $post_content = str_replace( '&quot;', '\\"', $post_content );
+		// allow for &quot
+		$post_content = str_replace( '&quot;', '\\"', $post_content );
 
-        return $post_content;
-    }
+		return $post_content;
+	}
 
 	private static function prepare_action_slashes( $val, $key, &$post_content ) {
 		if ( ! isset( $post_content[ $key ] ) ) {
@@ -1650,64 +1650,64 @@ 
 	}
 
 	public static function maybe_json_decode( $string ) {
-        if ( is_array($string) ) {
-            return $string;
-        }
+		if ( is_array($string) ) {
+			return $string;
+		}
 
-        $new_string = json_decode($string, true);
-        if ( function_exists('json_last_error') ) {
+		$new_string = json_decode($string, true);
+		if ( function_exists('json_last_error') ) {
 			// php 5.3+
-            if ( json_last_error() == JSON_ERROR_NONE ) {
-                $string = $new_string;
-            }
-        } else if ( isset($new_string) ) {
+			if ( json_last_error() == JSON_ERROR_NONE ) {
+				$string = $new_string;
+			}
+		} else if ( isset($new_string) ) {
 			// php < 5.3 fallback
-            $string = $new_string;
-        }
-        return $string;
-    }
-
-    /**
-     * @since 1.07.10
-     *
-     * @param string $post_type The name of the post type that may need to be highlighted
-     * echo The javascript to open and highlight the Formidable menu
-     */
+			$string = $new_string;
+		}
+		return $string;
+	}
+
+	/**
+	 * @since 1.07.10
+	 *
+	 * @param string $post_type The name of the post type that may need to be highlighted
+	 * echo The javascript to open and highlight the Formidable menu
+	 */
 	public static function maybe_highlight_menu( $post_type ) {
-        global $post;
+		global $post;
 
-        if ( isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != $post_type ) {
-            return;
-        }
+		if ( isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != $post_type ) {
+			return;
+		}
 
-        if ( is_object($post) && $post->post_type != $post_type ) {
-            return;
-        }
+		if ( is_object($post) && $post->post_type != $post_type ) {
+			return;
+		}
 
-        self::load_admin_wide_js();
-        echo '<script type="text/javascript">jQuery(document).ready(function(){frmSelectSubnav();});</script>';
-    }
+		self::load_admin_wide_js();
+		echo '<script type="text/javascript">jQuery(document).ready(function(){frmSelectSubnav();});</script>';
+	}
 
-    /**
-     * Load the JS file on non-Formidable pages in the admin area
-     * @since 2.0
-     */
+	/**
+	 * Load the JS file on non-Formidable pages in the admin area
+	 * @since 2.0
+	 */
 	public static function load_admin_wide_js( $load = true ) {
-        $version = FrmAppHelper::plugin_version();
+		$version = FrmAppHelper::plugin_version();
 		wp_register_script( 'formidable_admin_global', FrmAppHelper::plugin_url() . '/js/formidable_admin_global.js', array( 'jquery' ), $version );
 
-        wp_localize_script( 'formidable_admin_global', 'frmGlobal', array(
+		wp_localize_script( 'formidable_admin_global', 'frmGlobal', array(
 			'updating_msg' => __( 'Please wait while your site updates.', 'formidable' ),
-            'deauthorize'  => __( 'Are you sure you want to deauthorize Formidable Forms on this site?', 'formidable' ),
+			'deauthorize'  => __( 'Are you sure you want to deauthorize Formidable Forms on this site?', 'formidable' ),
 			'url'          => FrmAppHelper::plugin_url(),
 			'loading'      => __( 'Loading&hellip;' ),
 			'nonce'        => wp_create_nonce( 'frm_ajax' ),
-        ) );
+		) );
 
 		if ( $load ) {
 			wp_enqueue_script( 'formidable_admin_global' );
 		}
-    }
+	}
 
 	/**
 	 * @since 2.0.9
@@ -1716,9 +1716,9 @@ 
 		wp_enqueue_style( 'frm_fonts', self::plugin_url() . '/css/frm_fonts.css', array(), self::plugin_version() );
 	}
 
-    /**
-     * @param string $location
-     */
+	/**
+	 * @param string $location
+	 */
 	public static function localize_script( $location ) {
 		$ajax_url = admin_url( 'admin-ajax.php', is_ssl() ? 'admin' : 'http' );
 		$ajax_url = apply_filters( 'frm_ajax_url', $ajax_url );
@@ -1770,81 +1770,81 @@ 
 		}
 	}
 
-    /**
+	/**
 	 * echo the message on the plugins listing page
-     * @since 1.07.10
-     *
-     * @param float $min_version The version the add-on requires
-     */
+	 * @since 1.07.10
+	 *
+	 * @param float $min_version The version the add-on requires
+	 */
 	public static function min_version_notice( $min_version ) {
-        $frm_version = self::plugin_version();
+		$frm_version = self::plugin_version();
 
-        // check if Formidable meets minimum requirements
-        if ( version_compare($frm_version, $min_version, '>=') ) {
-            return;
-        }
+		// check if Formidable meets minimum requirements
+		if ( version_compare($frm_version, $min_version, '>=') ) {
+			return;
+		}
 
-        $wp_list_table = _get_list_table('WP_Plugins_List_Table');
+		$wp_list_table = _get_list_table('WP_Plugins_List_Table');
 		echo '<tr class="plugin-update-tr active"><th colspan="' . absint( $wp_list_table->get_column_count() ) . '" class="check-column plugin-update colspanchange"><div class="update-message">' .
-        __( 'You are running an outdated version of Formidable. This plugin may not work correctly if you do not update Formidable.', 'formidable' ) .
-        '</div></td></tr>';
-    }
-
-    public static function locales( $type = 'date' ) {
-        $locales = array(
-            'en' => __( 'English', 'formidable' ),    '' => __( 'English/Western', 'formidable' ),
-            'af' => __( 'Afrikaans', 'formidable' ),  'sq' => __( 'Albanian', 'formidable' ),
-            'ar' => __( 'Arabic', 'formidable' ),     'hy' => __( 'Armenian', 'formidable' ),
-            'az' => __( 'Azerbaijani', 'formidable' ), 'eu' => __( 'Basque', 'formidable' ),
-            'bs' => __( 'Bosnian', 'formidable' ),    'bg' => __( 'Bulgarian', 'formidable' ),
-            'ca' => __( 'Catalan', 'formidable' ),    'zh-HK' => __( 'Chinese Hong Kong', 'formidable' ),
-            'zh-CN' => __( 'Chinese Simplified', 'formidable' ), 'zh-TW' => __( 'Chinese Traditional', 'formidable' ),
-            'hr' => __( 'Croatian', 'formidable' ),   'cs' => __( 'Czech', 'formidable' ),
-            'da' => __( 'Danish', 'formidable' ),     'nl' => __( 'Dutch', 'formidable' ),
-            'en-GB' => __( 'English/UK', 'formidable' ), 'eo' => __( 'Esperanto', 'formidable' ),
-            'et' => __( 'Estonian', 'formidable' ),   'fo' => __( 'Faroese', 'formidable' ),
-            'fa' => __( 'Farsi/Persian', 'formidable' ), 'fil' => __( 'Filipino', 'formidable' ),
-            'fi' => __( 'Finnish', 'formidable' ),    'fr' => __( 'French', 'formidable' ),
-            'fr-CA' => __( 'French/Canadian', 'formidable' ), 'fr-CH' => __( 'French/Swiss', 'formidable' ),
-            'de' => __( 'German', 'formidable' ),     'de-AT' => __( 'German/Austria', 'formidable' ),
-            'de-CH' => __( 'German/Switzerland', 'formidable' ), 'el' => __( 'Greek', 'formidable' ),
-            'he' => __( 'Hebrew', 'formidable' ),     'iw' => __( 'Hebrew', 'formidable' ),
-            'hi' => __( 'Hindi', 'formidable' ),      'hu' => __( 'Hungarian', 'formidable' ),
-            'is' => __( 'Icelandic', 'formidable' ),  'id' => __( 'Indonesian', 'formidable' ),
-            'it' => __( 'Italian', 'formidable' ),    'ja' => __( 'Japanese', 'formidable' ),
-            'ko' => __( 'Korean', 'formidable' ),     'lv' => __( 'Latvian', 'formidable' ),
-            'lt' => __( 'Lithuanian', 'formidable' ), 'ms' => __( 'Malaysian', 'formidable' ),
-            'no' => __( 'Norwegian', 'formidable' ),  'pl' => __( 'Polish', 'formidable' ),
-            'pt' => __( 'Portuguese', 'formidable' ), 'pt-BR' => __( 'Portuguese/Brazilian', 'formidable' ),
-            'pt-PT' => __( 'Portuguese/Portugal', 'formidable' ), 'ro' => __( 'Romanian', 'formidable' ),
-            'ru' => __( 'Russian', 'formidable' ),    'sr' => __( 'Serbian', 'formidable' ),
-            'sr-SR' => __( 'Serbian', 'formidable' ), 'sk' => __( 'Slovak', 'formidable' ),
-            'sl' => __( 'Slovenian', 'formidable' ),  'es' => __( 'Spanish', 'formidable' ),
-            'es-419' => __( 'Spanish/Latin America', 'formidable' ), 'sv' => __( 'Swedish', 'formidable' ),
-            'ta' => __( 'Tamil', 'formidable' ),      'th' => __( 'Thai', 'formidable' ),
-            'tu' => __( 'Turkish', 'formidable' ),    'tr' => __( 'Turkish', 'formidable' ),
-            'uk' => __( 'Ukranian', 'formidable' ),   'vi' => __( 'Vietnamese', 'formidable' ),
-        );
-
-        if ( $type == 'captcha' ) {
-            // remove the languages unavailable for the captcha
-            $unset = array(
-                '', 'af', 'sq', 'hy', 'az', 'eu', 'bs',
-                'zh-HK', 'eo', 'et', 'fo', 'fr-CH',
-                'he', 'is', 'ms', 'sr-SR', 'ta', 'tu',
-            );
-        } else {
-            // remove the languages unavailable for the datepicker
-            $unset = array(
-                'en', 'fil', 'fr-CA', 'de-AT', 'de-AT',
-                'de-CH', 'iw', 'hi', 'pt', 'pt-PT',
-                'es-419', 'tr',
-            );
-        }
-
-        $locales = array_diff_key($locales, array_flip($unset));
-        $locales = apply_filters('frm_locales', $locales);
-
-        return $locales;
-    }
+		__( 'You are running an outdated version of Formidable. This plugin may not work correctly if you do not update Formidable.', 'formidable' ) .
+		'</div></td></tr>';
+	}
+
+	public static function locales( $type = 'date' ) {
+		$locales = array(
+			'en' => __( 'English', 'formidable' ),    '' => __( 'English/Western', 'formidable' ),
+			'af' => __( 'Afrikaans', 'formidable' ),  'sq' => __( 'Albanian', 'formidable' ),
+			'ar' => __( 'Arabic', 'formidable' ),     'hy' => __( 'Armenian', 'formidable' ),
+			'az' => __( 'Azerbaijani', 'formidable' ), 'eu' => __( 'Basque', 'formidable' ),
+			'bs' => __( 'Bosnian', 'formidable' ),    'bg' => __( 'Bulgarian', 'formidable' ),
+			'ca' => __( 'Catalan', 'formidable' ),    'zh-HK' => __( 'Chinese Hong Kong', 'formidable' ),
+			'zh-CN' => __( 'Chinese Simplified', 'formidable' ), 'zh-TW' => __( 'Chinese Traditional', 'formidable' ),
+			'hr' => __( 'Croatian', 'formidable' ),   'cs' => __( 'Czech', 'formidable' ),
+			'da' => __( 'Danish', 'formidable' ),     'nl' => __( 'Dutch', 'formidable' ),
+			'en-GB' => __( 'English/UK', 'formidable' ), 'eo' => __( 'Esperanto', 'formidable' ),
+			'et' => __( 'Estonian', 'formidable' ),   'fo' => __( 'Faroese', 'formidable' ),
+			'fa' => __( 'Farsi/Persian', 'formidable' ), 'fil' => __( 'Filipino', 'formidable' ),
+			'fi' => __( 'Finnish', 'formidable' ),    'fr' => __( 'French', 'formidable' ),
+			'fr-CA' => __( 'French/Canadian', 'formidable' ), 'fr-CH' => __( 'French/Swiss', 'formidable' ),
+			'de' => __( 'German', 'formidable' ),     'de-AT' => __( 'German/Austria', 'formidable' ),
+			'de-CH' => __( 'German/Switzerland', 'formidable' ), 'el' => __( 'Greek', 'formidable' ),
+			'he' => __( 'Hebrew', 'formidable' ),     'iw' => __( 'Hebrew', 'formidable' ),
+			'hi' => __( 'Hindi', 'formidable' ),      'hu' => __( 'Hungarian', 'formidable' ),
+			'is' => __( 'Icelandic', 'formidable' ),  'id' => __( 'Indonesian', 'formidable' ),
+			'it' => __( 'Italian', 'formidable' ),    'ja' => __( 'Japanese', 'formidable' ),
+			'ko' => __( 'Korean', 'formidable' ),     'lv' => __( 'Latvian', 'formidable' ),
+			'lt' => __( 'Lithuanian', 'formidable' ), 'ms' => __( 'Malaysian', 'formidable' ),
+			'no' => __( 'Norwegian', 'formidable' ),  'pl' => __( 'Polish', 'formidable' ),
+			'pt' => __( 'Portuguese', 'formidable' ), 'pt-BR' => __( 'Portuguese/Brazilian', 'formidable' ),
+			'pt-PT' => __( 'Portuguese/Portugal', 'formidable' ), 'ro' => __( 'Romanian', 'formidable' ),
+			'ru' => __( 'Russian', 'formidable' ),    'sr' => __( 'Serbian', 'formidable' ),
+			'sr-SR' => __( 'Serbian', 'formidable' ), 'sk' => __( 'Slovak', 'formidable' ),
+			'sl' => __( 'Slovenian', 'formidable' ),  'es' => __( 'Spanish', 'formidable' ),
+			'es-419' => __( 'Spanish/Latin America', 'formidable' ), 'sv' => __( 'Swedish', 'formidable' ),
+			'ta' => __( 'Tamil', 'formidable' ),      'th' => __( 'Thai', 'formidable' ),
+			'tu' => __( 'Turkish', 'formidable' ),    'tr' => __( 'Turkish', 'formidable' ),
+			'uk' => __( 'Ukranian', 'formidable' ),   'vi' => __( 'Vietnamese', 'formidable' ),
+		);
+
+		if ( $type == 'captcha' ) {
+			// remove the languages unavailable for the captcha
+			$unset = array(
+				'', 'af', 'sq', 'hy', 'az', 'eu', 'bs',
+				'zh-HK', 'eo', 'et', 'fo', 'fr-CH',
+				'he', 'is', 'ms', 'sr-SR', 'ta', 'tu',
+			);
+		} else {
+			// remove the languages unavailable for the datepicker
+			$unset = array(
+				'en', 'fil', 'fr-CA', 'de-AT', 'de-AT',
+				'de-CH', 'iw', 'hi', 'pt', 'pt-PT',
+				'es-419', 'tr',
+			);
+		}
+
+		$locales = array_diff_key($locales, array_flip($unset));
+		$locales = apply_filters('frm_locales', $locales);
+
+		return $locales;
+	}
 }

classes/helpers/FrmFieldsHelper.php

Indentation +765 added lines, -765 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' => 'default', '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();
@@ -183,21 +183,21 @@ 
 		return $msg;
 	}
 
-    public static function get_form_fields( $form_id, $error = false ) {
-        $fields = FrmField::get_all_for_form($form_id);
-        $fields = apply_filters('frm_get_paged_fields', $fields, $form_id, $error);
-        return $fields;
-    }
+	public static function get_form_fields( $form_id, $error = false ) {
+		$fields = FrmField::get_all_for_form($form_id);
+		$fields = apply_filters('frm_get_paged_fields', $fields, $form_id, $error);
+		return $fields;
+	}
 
 	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,138 +207,138 @@ 
     [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);
 
-        //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 = shortcode_parse_atts( $shortcodes[2][ $short_key ] );
+		foreach ( $shortcodes[0] as $short_key => $tag ) {
+			$atts = shortcode_parse_atts( $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 );
+		}
 
 		if ( $form ) {
-            $form = (array) $form;
+			$form = (array) $form;
 
-            //replace [form_key]
-            $html = str_replace('[form_key]', $form['form_key'], $html);
+			//replace [form_key]
+			$html = str_replace('[form_key]', $form['form_key'], $html);
 
-            //replace [form_name]
-            $html = str_replace('[form_name]', $form['name'], $html);
-        }
-        $html .= "\n";
+			//replace [form_name]
+			$html = str_replace('[form_name]', $form['name'], $html);
+		}
+		$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 );
 
@@ -346,8 +346,8 @@ 
 			$html = do_shortcode( $html );
 		}
 
-        return $html;
-    }
+		return $html;
+	}
 
 	/**
 	 * Add classes to a field div
@@ -401,46 +401,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
@@ -465,124 +465,124 @@ 
 			$class_prefix = 'frm-';
 		}
 
-        if ( $lang != 'en' ) {
+		if ( $lang != 'en' ) {
 			$api_js_url .= '&hl=' . $lang;
-        }
+		}
 		$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' );
 
 ?>
 <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 dropdown_categories( $args ) {
 		$defaults = array( 'field' => false, 'name' => false, 'show_option_all' => ' ' );
-        $args = wp_parse_args($args, $defaults);
+		$args = wp_parse_args($args, $defaults);
 
-        if ( ! $args['field'] ) {
-            return;
-        }
+		if ( ! $args['field'] ) {
+			return;
+		}
 
-        if ( ! $args['name'] ) {
+		if ( ! $args['name'] ) {
 			$args['name'] = 'item_meta[' . $args['field']['id'] . ']';
-        }
+		}
 
-        $id = self::get_html_id($args['field']);
-        $class = $args['field']['type'];
+		$id = self::get_html_id($args['field']);
+		$class = $args['field']['type'];
 
-        $exclude = (is_array($args['field']['exclude_cat'])) ? implode(',', $args['field']['exclude_cat']) : $args['field']['exclude_cat'];
-        $exclude = apply_filters('frm_exclude_cats', $exclude, $args['field']);
+		$exclude = (is_array($args['field']['exclude_cat'])) ? implode(',', $args['field']['exclude_cat']) : $args['field']['exclude_cat'];
+		$exclude = apply_filters('frm_exclude_cats', $exclude, $args['field']);
 
-        if ( is_array($args['field']['value']) ) {
-            if ( ! empty($exclude) ) {
-                $args['field']['value'] = array_diff($args['field']['value'], explode(',', $exclude));
-            }
-            $selected = reset($args['field']['value']);
-        } else {
-            $selected = $args['field']['value'];
-        }
+		if ( is_array($args['field']['value']) ) {
+			if ( ! empty($exclude) ) {
+				$args['field']['value'] = array_diff($args['field']['value'], explode(',', $exclude));
+			}
+			$selected = reset($args['field']['value']);
+		} else {
+			$selected = $args['field']['value'];
+		}
 
-        $tax_atts = array(
-            'show_option_all' => $args['show_option_all'], 'hierarchical' => 1, 'name' => $args['name'],
-            'id' => $id, 'exclude' => $exclude, 'class' => $class, 'selected' => $selected,
-            'hide_empty' => false, 'echo' => 0, 'orderby' => 'name',
-        );
+		$tax_atts = array(
+			'show_option_all' => $args['show_option_all'], 'hierarchical' => 1, 'name' => $args['name'],
+			'id' => $id, 'exclude' => $exclude, 'class' => $class, 'selected' => $selected,
+			'hide_empty' => false, 'echo' => 0, 'orderby' => 'name',
+		);
 
-        $tax_atts = apply_filters('frm_dropdown_cat', $tax_atts, $args['field']);
+		$tax_atts = apply_filters('frm_dropdown_cat', $tax_atts, $args['field']);
 
-        if ( FrmAppHelper::pro_is_installed() ) {
-            $post_type = FrmProFormsHelper::post_type($args['field']['form_id']);
-            $tax_atts['taxonomy'] = FrmProAppHelper::get_custom_taxonomy($post_type, $args['field']);
-            if ( ! $tax_atts['taxonomy'] ) {
-                return;
-            }
+		if ( FrmAppHelper::pro_is_installed() ) {
+			$post_type = FrmProFormsHelper::post_type($args['field']['form_id']);
+			$tax_atts['taxonomy'] = FrmProAppHelper::get_custom_taxonomy($post_type, $args['field']);
+			if ( ! $tax_atts['taxonomy'] ) {
+				return;
+			}
 
-            // If field type is dropdown (not Dynamic), exclude children when parent is excluded
-            if ( $args['field']['type'] != 'data' && is_taxonomy_hierarchical($tax_atts['taxonomy']) ) {
-                $tax_atts['exclude_tree'] = $exclude;
-            }
-        }
+			// If field type is dropdown (not Dynamic), exclude children when parent is excluded
+			if ( $args['field']['type'] != 'data' && is_taxonomy_hierarchical($tax_atts['taxonomy']) ) {
+				$tax_atts['exclude_tree'] = $exclude;
+			}
+		}
 
-        $dropdown = wp_dropdown_categories($tax_atts);
+		$dropdown = wp_dropdown_categories($tax_atts);
 
-        $add_html = FrmFieldsController::input_html($args['field'], false);
+		$add_html = FrmFieldsController::input_html($args['field'], false);
 
-        if ( FrmAppHelper::pro_is_installed() ) {
-            $add_html .= FrmProFieldsController::input_html($args['field'], false);
-        }
+		if ( FrmAppHelper::pro_is_installed() ) {
+			$add_html .= FrmProFieldsController::input_html($args['field'], false);
+		}
 
 		$dropdown = str_replace( "<select name='" . esc_attr( $args['name'] ) . "' id='" . esc_attr( $id ) . "' class='" . esc_attr( $class ) . "'", "<select name='" . esc_attr( $args['name'] ) . "' id='" . esc_attr( $id ) . "' " . $add_html, $dropdown );
 
-        if ( is_array($args['field']['value']) ) {
-            $skip = true;
-            foreach ( $args['field']['value'] as $v ) {
+		if ( is_array($args['field']['value']) ) {
+			$skip = true;
+			foreach ( $args['field']['value'] as $v ) {
 				if ( $skip ) {
-                    $skip = false;
-                    continue;
-                }
+					$skip = false;
+					continue;
+				}
 				$dropdown = str_replace(' value="' . esc_attr( $v ) . '"', ' value="' . esc_attr( $v ) . '" selected="selected"', $dropdown );
-                unset($v);
-            }
-        }
+				unset($v);
+			}
+		}
 
-        return $dropdown;
-    }
+		return $dropdown;
+	}
 
 	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
@@ -593,195 +593,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 = shortcode_parse_atts( $shortcodes[3][ $short_key ] );
+		foreach ( $shortcodes[0] as $short_key => $tag ) {
+			$atts = shortcode_parse_atts( $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 ) ) {
@@ -795,82 +795,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'] : ', ';
@@ -878,14 +878,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 );
@@ -895,58 +895,58 @@ 
 	}
 
 	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;
-    }
-
-    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
-    *
-    * @since 2.0.6
-    *
-    * @param string $opt_key
-    * @return boolean Returns true if current field option is an "Other" option
-    */
-    public static function is_other_opt( $opt_key ) {
-        return $opt_key && strpos( $opt_key, 'other' ) !== false;
-    }
-
-    /**
-    * Get value that belongs in "Other" text box
-    *
-    * @since 2.0.6
-    *
-    * @param array $args
-    */
-    public static function get_other_val( $args ) {
+		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);
+		}
+	}
+
+	/**
+	 * Check if current field option is an "other" option
+	 *
+	 * @since 2.0.6
+	 *
+	 * @param string $opt_key
+	 * @return boolean Returns true if current field option is an "Other" option
+	 */
+	public static function is_other_opt( $opt_key ) {
+		return $opt_key && strpos( $opt_key, 'other' ) !== false;
+	}
+
+	/**
+	 * 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,
@@ -1022,20 +1022,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;
@@ -1051,8 +1051,8 @@ 
 			$checked = 'checked="checked" ';
 		}
 
-        return $other_args;
-    }
+		return $other_args;
+	}
 
 	/**
 	 * @param array $args
@@ -1101,8 +1101,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' );
@@ -1123,15 +1123,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;
 
@@ -1189,10 +1189,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 . ' ';
@@ -1207,153 +1207,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' );
@@ -1390,8 +1390,8 @@ 
 		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 );
-    }
+	}
 }

Spacing +182 added lines, -182 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -7,12 +7,12 @@ 
 
 	public static function setup_new_vars( $type = '', $form_id = '' ) {
 
-        if ( strpos($type, '|') ) {
-            list($type, $setting) = explode('|', $type);
+        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);
+        $defaults = self::get_default_field_opts( $type, $form_id );
+        $defaults['field_options']['custom_html'] = self::get_default_html( $type );
 
         $values = array();
 
@@ -20,20 +20,20 @@ 
             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);
+                    $values['field_options'][$opt_var] = $opt_default;
+                    unset( $opt_var, $opt_default );
                 }
             } else {
-                $values[ $var ] = $default;
+                $values[$var] = $default;
             }
-            unset($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;
+                $values['field_options'][$setting] = 1;
             }
         }
 
@@ -56,13 +56,13 @@ 
         }
 
 		$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;
     }
@@ -88,8 +88,8 @@ 
             $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 ) : '';
@@ -100,7 +100,7 @@ 
         $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();
@@ -108,11 +108,11 @@ 
         }
 
 		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 ) );
     }
@@ -131,7 +131,7 @@ 
 
         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;
 
@@ -153,11 +153,11 @@ 
 
 		$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);
+        $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};
+            $values[$col] = $field->{$col};
         }
     }
 
@@ -171,21 +171,21 @@ 
 
 		$conf_msg = __( 'The entered values do not match', 'formidable' );
 		$defaults = array(
-			'unique_msg' => array( 'full' => $default_settings['unique_msg'], 'part' => sprintf( __('%s must be unique', 'formidable' ), $field_name ) ),
-			'invalid'   => array( 'full' => __( 'This field is invalid', 'formidable' ), 'part' => sprintf( __('%s is invalid', 'formidable' ), $field_name ) ),
+			'unique_msg' => array( 'full' => $default_settings['unique_msg'], 'part' => sprintf( __( '%s must be unique', 'formidable' ), $field_name ) ),
+			'invalid'   => array( 'full' => __( 'This field is invalid', 'formidable' ), 'part' => sprintf( __( '%s is invalid', 'formidable' ), $field_name ) ),
 			'blank'     => array( 'full' => $frm_settings->blank_msg, 'part' => $frm_settings->blank_msg ),
 			'conf_msg'  => array( 'full' => $conf_msg, 'part' => $conf_msg ),
 		);
 
 		$msg = FrmField::get_option( $field, $error );
-		$msg = empty( $msg ) ? $defaults[ $error ]['part'] : $msg;
+		$msg = empty( $msg ) ? $defaults[$error]['part'] : $msg;
 		$msg = do_shortcode( $msg );
 		return $msg;
 	}
 
     public static function get_form_fields( $form_id, $error = false ) {
-        $fields = FrmField::get_all_for_form($form_id);
-        $fields = apply_filters('frm_get_paged_fields', $fields, $form_id, $error);
+        $fields = FrmField::get_all_for_form( $form_id );
+        $fields = apply_filters( 'frm_get_paged_fields', $fields, $form_id, $error );
         return $fields;
     }
 
@@ -208,14 +208,14 @@ 
 </div>
 DEFAULT_HTML;
         } else {
-			$default_html = apply_filters('frm_other_custom_html', '', $type);
+			$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(
 			'field_name'    => 'item_meta[' . $field['id'] . ']',
@@ -223,42 +223,42 @@ 
             'field_plus_id' => '',
             'section_id'    => '',
         );
-        $args = wp_parse_args($args, $defaults);
+        $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']);
+        $html_id = self::get_html_id( $field, $args['field_plus_id'] );
 
-        if ( FrmField::is_multiple_select($field) ) {
+        if ( FrmField::is_multiple_select( $field ) ) {
             $field_name .= '[]';
         }
 
         //replace [id]
-        $html = str_replace('[id]', $field_id, $html);
+        $html = str_replace( '[id]', $field_id, $html );
 
         // Remove the for attribute for captcha
         if ( $field['type'] == 'captcha' ) {
-            $html = str_replace(' for="field_[key]"', '', $html);
+            $html = str_replace( ' for="field_[key]"', '', $html );
         }
 
         // set the label for
-        $html = str_replace('field_[key]', $html_id, $html);
+        $html = str_replace( 'field_[key]', $html_id, $html );
 
         //replace [key]
-        $html = str_replace('[key]', $field['field_key'], $html);
+        $html = str_replace( '[key]', $field['field_key'], $html );
 
         //replace [description] and [required_label] and [error]
 		$required = FrmField::is_required( $field ) ? $field['required_indicator'] : '';
         if ( ! is_array( $errors ) ) {
             $errors = array();
         }
-		$error = isset( $errors[ 'field' . $field_id ] ) ? $errors[ 'field' . $field_id ] : false;
+		$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);
+                $html = str_replace( '[label_position]', '[label_position] frm_section_spacing', $html );
             }
         }
 
@@ -268,41 +268,41 @@ 
 
         //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'] = 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);
+        $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);
+        $html = str_replace( '[entry_key]', $entry_key, $html );
 
         //replace [input]
-        preg_match_all("/\[(input|deletelink)\b(.*?)(?:(\/))?\]/s", $html, $shortcodes, PREG_PATTERN_ORDER);
+        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 = shortcode_parse_atts( $shortcodes[2][ $short_key ] );
+            $atts = shortcode_parse_atts( $shortcodes[2][$short_key] );
 			$tag = self::get_shortcode_tag( $shortcodes, $short_key, array( 'conditional' => false, 'conditional_check' => false ) );
 
             $replace_with = '';
 
             if ( $tag == 'input' ) {
-                if ( isset($atts['opt']) ) {
-                    $atts['opt']--;
+                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;
@@ -311,33 +311,33 @@ 
                 $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 = 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 );
         }
 
 		if ( $form ) {
             $form = (array) $form;
 
             //replace [form_key]
-            $html = str_replace('[form_key]', $form['form_key'], $html);
+            $html = str_replace( '[form_key]', $form['form_key'], $html );
 
             //replace [form_name]
-            $html = str_replace('[form_name]', $form['name'], $html);
+            $html = str_replace( '[form_name]', $form['name'], $html );
         }
         $html .= "\n";
 
         //Return html if conf_field to prevent loop
-        if ( isset($field['conf_field']) && $field['conf_field'] == 'stop' ) {
+        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'] ));
+            $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 ));
+            $html = apply_filters( 'frm_replace_shortcodes', $html, $field, array( 'errors' => $errors, 'form' => $form ) );
         }
 
 		self::remove_collapse_shortcode( $html );
@@ -382,14 +382,14 @@ 
 	 */
 	private static function get_field_div_classes( $field_id, $field, $errors, $html ) {
 		// Add error class
-		$classes = isset( $errors[ 'field' . $field_id ] ) ? ' frm_blank_field' : '';
+		$classes = isset( $errors['field' . $field_id] ) ? ' frm_blank_field' : '';
 
 		// Add label position class
 		$classes .= ' frm_' . $field['label'] . '_container';
 
 		// Add CSS layout classes
 		if ( ! empty( $field['classes'] ) ) {
-			if ( ! strpos( $html, 'frm_form_field ') ) {
+			if ( ! strpos( $html, 'frm_form_field ' ) ) {
 				$classes .= ' frm_form_field';
 			}
 			$classes .= ' ' . $field['classes'];
@@ -428,15 +428,15 @@ 
         }
 
         $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) ) {
+        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 ];
+            $tag = $shortcodes[$with_tags - 1][$short_key];
         }
 
         return $tag;
@@ -480,10 +480,10 @@ 
 
 	public static function show_single_option( $field ) {
         $field_name = $field['name'];
-        $html_id = self::get_html_id($field);
+        $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_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 ( self::is_other_opt( $opt_key ) ) {
@@ -498,7 +498,7 @@ 
 
 	public static function dropdown_categories( $args ) {
 		$defaults = array( 'field' => false, 'name' => false, 'show_option_all' => ' ' );
-        $args = wp_parse_args($args, $defaults);
+        $args = wp_parse_args( $args, $defaults );
 
         if ( ! $args['field'] ) {
             return;
@@ -508,17 +508,17 @@ 
 			$args['name'] = 'item_meta[' . $args['field']['id'] . ']';
         }
 
-        $id = self::get_html_id($args['field']);
+        $id = self::get_html_id( $args['field'] );
         $class = $args['field']['type'];
 
-        $exclude = (is_array($args['field']['exclude_cat'])) ? implode(',', $args['field']['exclude_cat']) : $args['field']['exclude_cat'];
-        $exclude = apply_filters('frm_exclude_cats', $exclude, $args['field']);
+        $exclude = ( is_array( $args['field']['exclude_cat'] ) ) ? implode( ',', $args['field']['exclude_cat'] ) : $args['field']['exclude_cat'];
+        $exclude = apply_filters( 'frm_exclude_cats', $exclude, $args['field'] );
 
-        if ( is_array($args['field']['value']) ) {
-            if ( ! empty($exclude) ) {
-                $args['field']['value'] = array_diff($args['field']['value'], explode(',', $exclude));
+        if ( is_array( $args['field']['value'] ) ) {
+            if ( ! empty( $exclude ) ) {
+                $args['field']['value'] = array_diff( $args['field']['value'], explode( ',', $exclude ) );
             }
-            $selected = reset($args['field']['value']);
+            $selected = reset( $args['field']['value'] );
         } else {
             $selected = $args['field']['value'];
         }
@@ -529,40 +529,40 @@ 
             'hide_empty' => false, 'echo' => 0, 'orderby' => 'name',
         );
 
-        $tax_atts = apply_filters('frm_dropdown_cat', $tax_atts, $args['field']);
+        $tax_atts = apply_filters( 'frm_dropdown_cat', $tax_atts, $args['field'] );
 
         if ( FrmAppHelper::pro_is_installed() ) {
-            $post_type = FrmProFormsHelper::post_type($args['field']['form_id']);
-            $tax_atts['taxonomy'] = FrmProAppHelper::get_custom_taxonomy($post_type, $args['field']);
+            $post_type = FrmProFormsHelper::post_type( $args['field']['form_id'] );
+            $tax_atts['taxonomy'] = FrmProAppHelper::get_custom_taxonomy( $post_type, $args['field'] );
             if ( ! $tax_atts['taxonomy'] ) {
                 return;
             }
 
             // If field type is dropdown (not Dynamic), exclude children when parent is excluded
-            if ( $args['field']['type'] != 'data' && is_taxonomy_hierarchical($tax_atts['taxonomy']) ) {
+            if ( $args['field']['type'] != 'data' && is_taxonomy_hierarchical( $tax_atts['taxonomy'] ) ) {
                 $tax_atts['exclude_tree'] = $exclude;
             }
         }
 
-        $dropdown = wp_dropdown_categories($tax_atts);
+        $dropdown = wp_dropdown_categories( $tax_atts );
 
-        $add_html = FrmFieldsController::input_html($args['field'], false);
+        $add_html = FrmFieldsController::input_html( $args['field'], false );
 
         if ( FrmAppHelper::pro_is_installed() ) {
-            $add_html .= FrmProFieldsController::input_html($args['field'], false);
+            $add_html .= FrmProFieldsController::input_html( $args['field'], false );
         }
 
 		$dropdown = str_replace( "<select name='" . esc_attr( $args['name'] ) . "' id='" . esc_attr( $id ) . "' class='" . esc_attr( $class ) . "'", "<select name='" . esc_attr( $args['name'] ) . "' id='" . esc_attr( $id ) . "' " . $add_html, $dropdown );
 
-        if ( is_array($args['field']['value']) ) {
+        if ( is_array( $args['field']['value'] ) ) {
             $skip = true;
             foreach ( $args['field']['value'] as $v ) {
 				if ( $skip ) {
                     $skip = false;
                     continue;
                 }
-				$dropdown = str_replace(' value="' . esc_attr( $v ) . '"', ' value="' . esc_attr( $v ) . '" selected="selected"', $dropdown );
-                unset($v);
+				$dropdown = str_replace( ' value="' . esc_attr( $v ) . '"', ' value="' . esc_attr( $v ) . '" selected="selected"', $dropdown );
+                unset( $v );
             }
         }
 
@@ -570,7 +570,7 @@ 
     }
 
 	public static function get_term_link( $tax_id ) {
-        $tax = get_taxonomy($tax_id);
+        $tax = get_taxonomy( $tax_id );
         if ( ! $tax ) {
             return;
         }
@@ -579,7 +579,7 @@ 
             __( '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;
     }
@@ -593,8 +593,8 @@ 
 		$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);
+        if ( is_array( $observed_value ) ) {
+            return self::array_value_condition( $observed_value, $cond, $hide_opt );
         }
 
         $m = false;
@@ -607,7 +607,7 @@ 
         } else if ( $cond == '<' ) {
             $m = $observed_value < $hide_opt;
         } else if ( $cond == 'LIKE' || $cond == 'not LIKE' ) {
-            $m = stripos($observed_value, $hide_opt);
+            $m = stripos( $observed_value, $hide_opt );
             if ( $cond == 'not LIKE' ) {
                 $m = ( $m === false ) ? true : false;
             } else {
@@ -620,23 +620,23 @@ 
 	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;
+            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);
+                $m = in_array( $hide_opt, $observed_value );
             }
         } else if ( $cond == '!=' ) {
-            $m = ! in_array($hide_opt, $observed_value);
+            $m = ! in_array( $hide_opt, $observed_value );
         } else if ( $cond == '>' ) {
-            $min = min($observed_value);
+            $min = min( $observed_value );
             $m = $min > $hide_opt;
         } else if ( $cond == '<' ) {
-            $max = max($observed_value);
+            $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);
+                $m = strpos( $ob, $hide_opt );
                 if ( $m !== false ) {
                     $m = true;
                     break;
@@ -657,27 +657,27 @@ 
      * @return string
      */
 	public static function basic_replace_shortcodes( $value, $form, $entry ) {
-        if ( strpos($value, '[sitename]') !== false ) {
+        if ( strpos( $value, '[sitename]' ) !== false ) {
             $new_value = wp_specialchars_decode( FrmAppHelper::site_name(), ENT_QUOTES );
-            $value = str_replace('[sitename]', $new_value, $value);
+            $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;
     }
 
 	public static function get_shortcodes( $content, $form_id ) {
         if ( FrmAppHelper::pro_is_installed() ) {
-            return FrmProDisplaysHelper::get_shortcodes($content, $form_id);
+            return FrmProDisplaysHelper::get_shortcodes( $content, $form_id );
         }
 
         $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;
     }
@@ -695,7 +695,7 @@ 
             $tagregexp[] = $field->field_key;
         }
 
-        $tagregexp = implode('|', $tagregexp);
+        $tagregexp = implode( '|', $tagregexp );
         return $tagregexp;
     }
 
@@ -707,28 +707,28 @@ 
         );
 
         foreach ( $shortcodes[0] as $short_key => $tag ) {
-            $atts = shortcode_parse_atts( $shortcodes[3][ $short_key ] );
+            $atts = shortcode_parse_atts( $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) ) {
+            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 ];
+                $tag = $shortcodes[2][$short_key];
             }
 
             switch ( $tag ) {
                 case 'id':
                 case 'key':
                 case 'ip':
-                    $replace_with = $shortcode_values[ $tag ];
+                    $replace_with = $shortcode_values[$tag];
                 break;
 
                 case 'user_agent':
                 case 'user-agent':
-                    $entry->description = maybe_unserialize($entry->description);
+                    $entry->description = maybe_unserialize( $entry->description );
 					$replace_with = FrmEntryFormat::get_browser( $entry->description['browser'] );
                 break;
 
@@ -736,25 +736,25 @@ 
                 case 'created-at':
                 case 'updated_at':
                 case 'updated-at':
-                    if ( isset($atts['format']) ) {
+                    if ( isset( $atts['format'] ) ) {
                         $time_format = ' ';
                     } else {
-                        $atts['format'] = get_option('date_format');
+                        $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);
+                    $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);
+                    $this_tag = str_replace( '-', '_', $tag );
 					$replace_with = self::get_display_value( $entry->{$this_tag}, (object) array( 'type' => 'user_id' ), $atts );
-                    unset($this_tag);
+                    unset( $this_tag );
                 break;
 
                 case 'admin_email':
@@ -771,16 +771,16 @@ 
                         break;
                     }
 
-                    $sep = isset($atts['sep']) ? $atts['sep'] : ', ';
+                    $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' ) {
+                    if ( isset( $atts['show'] ) && $atts['show'] == 'field_label' ) {
                         $replace_with = $field->name;
-                    } else if ( isset($atts['show']) && $atts['show'] == 'description' ) {
+                    } else if ( isset( $atts['show'] ) && $atts['show'] == 'description' ) {
                         $replace_with = $field->description;
 					} else {
 						$string_value = $replace_with;
@@ -795,15 +795,15 @@ 
 						}
 					}
 
-                    unset($field);
+                    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;
@@ -819,7 +819,7 @@ 
         $new_value = '';
         switch ( $tag ) {
             case 'admin_email':
-                $new_value = get_option('admin_email');
+                $new_value = get_option( 'admin_email' );
                 break;
             case 'siteurl':
                 $new_value = FrmAppHelper::site_url();
@@ -845,28 +845,28 @@ 
      * @return string|array
      */
     public static function process_get_shortcode( $atts, $return_array = false ) {
-        if ( ! isset($atts['param']) ) {
+        if ( ! isset( $atts['param'] ) ) {
             return '';
         }
 
-        if ( strpos($atts['param'], '&#91;') ) {
-            $atts['param'] = str_replace('&#91;', '[', $atts['param']);
-            $atts['param'] = str_replace('&#93;', ']', $atts['param']);
+        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_param( $atts['param'], '' );
         $new_value = FrmAppHelper::get_query_var( $new_value, $atts['param'] );
 
         if ( $new_value == '' ) {
-            if ( ! isset($atts['prev_val']) ) {
+            if ( ! isset( $atts['prev_val'] ) ) {
                 $atts['prev_val'] = '';
             }
 
-            $new_value = isset($atts['default']) ? $atts['default'] : $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);
+        if ( is_array( $new_value ) && ! $return_array ) {
+            $new_value = implode( ', ', $new_value );
         }
 
         return $new_value;
@@ -879,12 +879,12 @@ 
 		$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);
+            $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);
+                $replace_with = wpautop( $replace_with );
             }
 			unset( $autop );
 		} else if ( is_array( $replace_with ) ) {
@@ -906,14 +906,14 @@ 
 		$field_selection = array_merge( FrmField::pro_field_selection(), FrmField::field_selection() );
 
         $field_types = array();
-        if ( in_array($type, $single_input) ) {
+        if ( in_array( $type, $single_input ) ) {
             self::field_types_for_input( $single_input, $field_selection, $field_types );
-        } else if ( in_array($type, $multiple_input) ) {
+        } 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) ) {
+        } 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 ];
+		} else if ( isset( $field_selection[$type] ) ) {
+            $field_types[$type] = $field_selection[$type];
         }
 
 		$field_types = apply_filters( 'frm_switch_field_types', $field_types, compact( 'type' ) );
@@ -922,8 +922,8 @@ 
 
     private static function field_types_for_input( $inputs, $fields, &$field_types ) {
         foreach ( $inputs as $input ) {
-            $field_types[ $input ] = $fields[ $input ];
-            unset($input);
+            $field_types[$input] = $fields[$input];
+            unset( $input );
         }
     }
 
@@ -968,21 +968,21 @@ 
 		// Check posted vals before checking saved values
 
 		// For fields inside repeating sections - note, don't check if $pointer is true because it will often be zero
-		if ( $parent && isset( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ] ) ) {
+		if ( $parent && isset( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']] ) ) {
 			if ( FrmField::is_field_with_multiple_values( $field ) ) {
-				$other_val = isset( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ][ $opt_key ] ) ? sanitize_text_field( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ][ $opt_key ] ) : '';
+				$other_val = isset( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']][$opt_key] ) ? sanitize_text_field( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']][$opt_key] ) : '';
 			} else {
-				$other_val = sanitize_text_field( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ] );
+				$other_val = sanitize_text_field( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']] );
 			}
 			return $other_val;
 
-		} else if ( isset( $field['id'] ) && isset( $_POST['item_meta']['other'][ $field['id'] ] ) ) {
+		} else if ( isset( $field['id'] ) && isset( $_POST['item_meta']['other'][$field['id']] ) ) {
 			// For normal fields
 
 			if ( FrmField::is_field_with_multiple_values( $field ) ) {
-				$other_val = isset( $_POST['item_meta']['other'][ $field['id'] ][ $opt_key ] ) ? sanitize_text_field( $_POST['item_meta']['other'][ $field['id'] ][ $opt_key ] ) : '';
+				$other_val = isset( $_POST['item_meta']['other'][$field['id']][$opt_key] ) ? sanitize_text_field( $_POST['item_meta']['other'][$field['id']][$opt_key] ) : '';
 			} else {
-				$other_val = sanitize_text_field( $_POST['item_meta']['other'][ $field['id'] ] );
+				$other_val = sanitize_text_field( $_POST['item_meta']['other'][$field['id']] );
 			}
 			return $other_val;
 		}
@@ -991,8 +991,8 @@ 
 		if ( $field['type'] == 'checkbox' && is_array( $field['value'] ) ) {
 			// Check if there is an "other" val in saved value and make sure the
 			// "other" val is not equal to the Other checkbox option
-			if ( isset( $field['value'][ $opt_key ] ) && $field['options'][ $opt_key ] != $field['value'][ $opt_key ] ) {
-				$other_val = $field['value'][ $opt_key ];
+			if ( isset( $field['value'][$opt_key] ) && $field['options'][$opt_key] != $field['value'][$opt_key] ) {
+				$other_val = $field['value'][$opt_key];
 			}
 		} else {
 			/**
@@ -1004,8 +1004,8 @@ 
 				// Multi-select dropdowns - key is not preserved
 				if ( is_array( $field['value'] ) ) {
 					$o_key = array_search( $temp_val, $field['value'] );
-					if ( isset( $field['value'][ $o_key ] ) ) {
-						unset( $field['value'][ $o_key ], $o_key );
+					if ( isset( $field['value'][$o_key] ) ) {
+						unset( $field['value'][$o_key], $o_key );
 					}
 				} else if ( $temp_val == $field['value'] ) {
 					// For radio and regular dropdowns
@@ -1062,7 +1062,7 @@ 
 	private static function set_other_name( $args, &$other_args ) {
 		//Set up name for other field
 		$other_args['name'] = str_replace( '[]', '', $args['field_name'] );
-		$other_args['name'] = preg_replace('/\[' . $args['field']['id'] . '\]$/', '', $other_args['name']);
+		$other_args['name'] = preg_replace( '/\[' . $args['field']['id'] . '\]$/', '', $other_args['name'] );
 		$other_args['name'] = $other_args['name'] . '[other]' . '[' . $args['field']['id'] . ']';
 
 		//Converts item_meta[field_id] => item_meta[other][field_id] and
@@ -1088,7 +1088,7 @@ 
 		// Count should only be greater than 3 if inside of a repeating section
 		if ( count( $temp_array ) > 3 ) {
 			$parent = str_replace( ']', '', $temp_array[1] );
-			$pointer = str_replace( ']', '', $temp_array[2]);
+			$pointer = str_replace( ']', '', $temp_array[2] );
 		}
 
 		// Get text for "other" text field
@@ -1207,15 +1207,15 @@ 
 			$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);
+                $val[$k] = str_replace( $replace, $replace_with, $v );
+                unset( $k, $v );
             }
         } else {
-            $val = str_replace($replace, $replace_with, $val);
+            $val = str_replace( $replace, $replace_with, $val );
         }
 
         return $val;
@@ -1228,7 +1228,7 @@ 
             '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',
+            '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',
@@ -1319,35 +1319,35 @@ 
     }
 
 	public static function get_bulk_prefilled_opts( array &$prepop ) {
-		$prepop[ __( 'Countries', 'formidable' ) ] = FrmFieldsHelper::get_countries();
+		$prepop[__( 'Countries', 'formidable' )] = FrmFieldsHelper::get_countries();
 
         $states = FrmFieldsHelper::get_us_states();
-        $state_abv = array_keys($states);
-        sort($state_abv);
-		$prepop[ __( 'U.S. State Abbreviations', 'formidable' ) ] = $state_abv;
+        $state_abv = array_keys( $states );
+        sort( $state_abv );
+		$prepop[__( 'U.S. State Abbreviations', 'formidable' )] = $state_abv;
 
-        $states = array_values($states);
-        sort($states);
-		$prepop[ __( 'U.S. States', 'formidable' ) ] = $states;
-        unset($state_abv, $states);
+        $states = array_values( $states );
+        sort( $states );
+		$prepop[__( 'U.S. States', 'formidable' )] = $states;
+        unset( $state_abv, $states );
 
-		$prepop[ __( 'Age', 'formidable' ) ] = array(
+		$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' ),
         );
 
-		$prepop[ __( 'Satisfaction', 'formidable' ) ] = array(
+		$prepop[__( 'Satisfaction', 'formidable' )] = array(
             __( 'Very Satisfied', 'formidable' ), __( 'Satisfied', 'formidable' ), __( 'Neutral', 'formidable' ),
             __( 'Unsatisfied', 'formidable' ), __( 'Very Unsatisfied', 'formidable' ), __( 'N/A', 'formidable' ),
         );
 
-		$prepop[ __( 'Importance', 'formidable' ) ] = array(
+		$prepop[__( 'Importance', 'formidable' )] = array(
             __( 'Very Important', 'formidable' ), __( 'Important', 'formidable' ), __( 'Neutral', 'formidable' ),
             __( 'Somewhat Important', 'formidable' ), __( 'Not at all Important', 'formidable' ), __( 'N/A', 'formidable' ),
         );
 
-		$prepop[ __( 'Agreement', 'formidable' ) ] = array(
+		$prepop[__( 'Agreement', 'formidable' )] = array(
             __( 'Strongly Agree', 'formidable' ), __( 'Agree', 'formidable' ), __( 'Neutral', 'formidable' ),
             __( 'Disagree', 'formidable' ), __( 'Strongly Disagree', 'formidable' ), __( 'N/A', 'formidable' ),
         );

classes/models/FrmDb.php

Doc Comments +1 added lines, -1 removed lines

@@ -308,7 +308,7 @@
 	 *
 	 * @since 2.02.05
 	 * @param string $key
-	 * @param int|string $value
+	 * @param string $value
 	 * @param string $where
 	 */
     private static function add_query_placeholder( $key, $value, &$where ) {

Spacing +50 added lines, -50 removed lines

@@ -7,8 +7,8 @@ 
     var $entry_metas;
 
     public function __construct() {
-        if ( ! defined('ABSPATH') ) {
-            die('You are not allowed to call this page directly.');
+        if ( ! defined( 'ABSPATH' ) ) {
+            die( 'You are not allowed to call this page directly.' );
         }
 
         global $wpdb;
@@ -24,7 +24,7 @@ 
         $frm_db_version = FrmAppHelper::$db_version;
         $old_db_version = (float) $old_db_version;
         if ( ! $old_db_version ) {
-            $old_db_version = get_option('frm_db_version');
+            $old_db_version = get_option( 'frm_db_version' );
         }
 
         if ( $frm_db_version != $old_db_version ) {
@@ -34,16 +34,16 @@ 
 			require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
             $this->create_tables();
-            $this->migrate_data($frm_db_version, $old_db_version);
+            $this->migrate_data( $frm_db_version, $old_db_version );
 
             /***** SAVE DB VERSION *****/
-            update_option('frm_db_version', $frm_db_version);
+            update_option( 'frm_db_version', $frm_db_version );
 
             /**** ADD/UPDATE DEFAULT TEMPLATES ****/
             FrmXMLController::add_default_templates();
         }
 
-        do_action('frm_after_install');
+        do_action( 'frm_after_install' );
 
         /**** update the styling settings ****/
 		if ( is_admin() && function_exists( 'get_filesystem_method' ) ) {
@@ -153,7 +153,7 @@ 
 				global $wpdb;
 				$wpdb->query( $q . $charset_collate );
 			}
-            unset($q);
+            unset( $q );
         }
     }
 
@@ -178,7 +178,7 @@ 
 	 * @param string $starts_with
      */
     public static function get_where_clause_and_values( &$args, $starts_with = ' WHERE ' ) {
-        if ( empty($args) ) {
+        if ( empty( $args ) ) {
 			// add an arg to prevent prepare from failing
 			$args = array( 'where' => $starts_with . '1=%d', 'values' => array( 1 ) );
 			return;
@@ -238,8 +238,8 @@ 
     private static function interpret_array_to_sql( $key, $value, &$where, &$values ) {
 		$key = trim( $key );
 
-        if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false  ) {
-            $k = explode(' ', $key);
+        if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false ) {
+            $k = explode( ' ', $key );
             $where .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key );
             $values[] = '%Y-%m-%d %H:%i:%s';
         } else {
@@ -252,7 +252,7 @@ 
         if ( is_array( $value ) ) {
             // translate array of values to "in"
 			if ( strpos( $lowercase_key, 'like' ) !== false ) {
-				$where = preg_replace('/' . $key . '$/', '', $where);
+				$where = preg_replace( '/' . $key . '$/', '', $where );
 				$where .= '(';
 				$start = true;
 				foreach ( $value as $v ) {
@@ -403,8 +403,8 @@ 
 		);
 
 		$where_is = strtolower( $where_is );
-		if ( isset( $switch_to[ $where_is ] ) ) {
-			return ' ' . $switch_to[ $where_is ];
+		if ( isset( $switch_to[$where_is] ) ) {
+			return ' ' . $switch_to[$where_is];
 		}
 
 		// > and < need a little more work since we don't want them switched to >= and <=
@@ -426,8 +426,8 @@ 
     private static function get_group_and_table_name( &$table, &$group ) {
 		global $wpdb, $wpmuBaseTablePrefix;
 
-        $table_parts = explode(' ', $table);
-        $group = reset($table_parts);
+        $table_parts = explode( ' ', $table );
+        $group = reset( $table_parts );
         $group = str_replace( $wpdb->prefix, '', $group );
 
 		$prefix = $wpmuBaseTablePrefix ? $wpmuBaseTablePrefix : $wpdb->base_prefix;
@@ -442,7 +442,7 @@ 
     }
 
     private static function convert_options_to_array( &$args, $order_by = '', $limit = '' ) {
-        if ( ! is_array($args) ) {
+        if ( ! is_array( $args ) ) {
 			$args = array( 'order_by' => $args );
         }
 
@@ -457,16 +457,16 @@ 
         $temp_args = $args;
         foreach ( $temp_args as $k => $v ) {
             if ( $v == '' ) {
-				unset( $args[ $k ] );
+				unset( $args[$k] );
                 continue;
             }
 
             if ( $k == 'limit' ) {
-				$args[ $k ] = FrmAppHelper::esc_limit( $v );
+				$args[$k] = FrmAppHelper::esc_limit( $v );
             }
             $db_name = strtoupper( str_replace( '_', ' ', $k ) );
             if ( strpos( $v, $db_name ) === false ) {
-				$args[ $k ] = $db_name . ' ' . $v;
+				$args[$k] = $db_name . ' ' . $v;
             }
         }
 
@@ -493,7 +493,7 @@ 
 
 		$query = self::generate_query_string_from_pieces( $columns, $table, $where );
 
-		$cache_key = str_replace( array( ' ', ',' ), '_', trim( implode( '_', FrmAppHelper::array_flatten( $where ) ) . $columns . '_results_ARRAY_A' , ' WHERE' ) );
+		$cache_key = str_replace( array( ' ', ',' ), '_', trim( implode( '_', FrmAppHelper::array_flatten( $where ) ) . $columns . '_results_ARRAY_A', ' WHERE' ) );
 		$results = FrmAppHelper::check_cache( $cache_key, $group, $query, 'get_associative_results' );
 
 		return $results;
@@ -532,7 +532,7 @@ 
     public function uninstall() {
 		if ( ! current_user_can( 'administrator' ) ) {
             $frm_settings = FrmAppHelper::get_settings();
-            wp_die($frm_settings->admin_permission);
+            wp_die( $frm_settings->admin_permission );
         }
 
         global $wpdb, $wp_roles;
@@ -542,8 +542,8 @@ 
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->entries );
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->entry_metas );
 
-        delete_option('frm_options');
-        delete_option('frm_db_version');
+        delete_option( 'frm_options' );
+        delete_option( 'frm_db_version' );
 
         //delete roles
         $frm_roles = FrmAppHelper::frm_capabilities();
@@ -551,11 +551,11 @@ 
         foreach ( $frm_roles as $frm_role => $frm_role_description ) {
             foreach ( $roles as $role => $details ) {
                 $wp_roles->remove_cap( $role, $frm_role );
-                unset($role, $details);
+                unset( $role, $details );
     		}
-    		unset($frm_role, $frm_role_description);
+    		unset( $frm_role, $frm_role_description );
 		}
-		unset($roles, $frm_roles);
+		unset( $roles, $frm_roles );
 
 		// delete actions, views, and styles
 
@@ -577,7 +577,7 @@ 
 
 		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->options . ' WHERE option_name LIKE %s OR option_name LIKE %s', '_transient_timeout_frm_form_fields_%', '_transient_frm_form_fields_%' ) );
 
-        do_action('frm_after_uninstall');
+        do_action( 'frm_after_uninstall' );
         return true;
     }
 
@@ -634,8 +634,8 @@ 
 
         $updated = 0;
         foreach ( $fields as $f ) {
-            $f->field_options = maybe_unserialize($f->field_options);
-            if ( empty($f->field_options['size']) || ! is_numeric($f->field_options['size']) ) {
+            $f->field_options = maybe_unserialize( $f->field_options );
+            if ( empty( $f->field_options['size'] ) || ! is_numeric( $f->field_options['size'] ) ) {
                 continue;
             }
 
@@ -643,27 +643,27 @@ 
             $f->field_options['size'] .= 'px';
             $u = FrmField::update( $f->id, array( 'field_options' => $f->field_options ) );
             if ( $u ) {
-                $updated++;
+                $updated ++;
             }
-            unset($f);
+            unset( $f );
         }
 
         // Change the characters in widgets to pixels
-        $widgets = get_option('widget_frm_show_form');
-        if ( empty($widgets) ) {
+        $widgets = get_option( 'widget_frm_show_form' );
+        if ( empty( $widgets ) ) {
             return;
         }
 
-        $widgets = maybe_unserialize($widgets);
+        $widgets = maybe_unserialize( $widgets );
         foreach ( $widgets as $k => $widget ) {
-            if ( ! is_array($widget) || ! isset($widget['size']) ) {
+            if ( ! is_array( $widget ) || ! isset( $widget['size'] ) ) {
                 continue;
             }
 			$size = round( $pixel_conversion * (int) $widget['size'] );
             $size .= 'px';
-			$widgets[ $k ]['size'] = $size;
+			$widgets[$k]['size'] = $size;
         }
-        update_option('widget_frm_show_form', $widgets);
+        update_option( 'widget_frm_show_form', $widgets );
     }
 
     /**
@@ -712,7 +712,7 @@ 
 			}
 
             // Format form options
-            $form_options = maybe_unserialize($form->options);
+            $form_options = maybe_unserialize( $form->options );
 
             // Migrate settings to actions
             FrmXMLHelper::migrate_form_settings_to_actions( $form_options, $form->id );
@@ -722,7 +722,7 @@ 
     private function migrate_to_11() {
         global $wpdb;
 
-        $forms = FrmDb::get_results( $this->forms, array(), 'id, options');
+        $forms = FrmDb::get_results( $this->forms, array(), 'id, options' );
 
         $sending = __( 'Sending', 'formidable' );
 		$img = FrmAppHelper::plugin_url() . '/images/ajax_loader.gif';
@@ -733,13 +733,13 @@ 
 <img class="frm_ajax_loading" src="$img" alt="$sending" style="visibility:hidden;" />
 </div>
 DEFAULT_HTML;
-        unset($sending, $img);
+        unset( $sending, $img );
 
-        $new_default_html = FrmFormsHelper::get_default_html('submit');
+        $new_default_html = FrmFormsHelper::get_default_html( 'submit' );
         $draft_link = FrmFormsHelper::get_draft_link();
 		foreach ( $forms as $form ) {
-            $form->options = maybe_unserialize($form->options);
-            if ( ! isset($form->options['submit_html']) || empty($form->options['submit_html']) ) {
+            $form->options = maybe_unserialize( $form->options );
+            if ( ! isset( $form->options['submit_html'] ) || empty( $form->options['submit_html'] ) ) {
                 continue;
             }
 
@@ -750,9 +750,9 @@ 
 				$form->options['submit_html'] = preg_replace( '~\<\/div\>(?!.*\<\/div\>)~', $draft_link . "\r\n</div>", $form->options['submit_html'] );
 				$wpdb->update( $this->forms, array( 'options' => serialize( $form->options ) ), array( 'id' => $form->id ) );
             }
-            unset($form);
+            unset( $form );
         }
-        unset($forms);
+        unset( $forms );
     }
 
     private function migrate_to_6() {
@@ -781,16 +781,16 @@ 
 </div>
 DEFAULT_HTML;
 
-        $new_default_html = FrmFieldsHelper::get_default_html('text');
+        $new_default_html = FrmFieldsHelper::get_default_html( 'text' );
         foreach ( $fields as $field ) {
-            $field->field_options = maybe_unserialize($field->field_options);
+            $field->field_options = maybe_unserialize( $field->field_options );
 			if ( ! FrmField::is_option_empty( $field, 'custom_html' ) || $field->field_options['custom_html'] == $default_html || $field->field_options['custom_html'] == $old_default_html ) {
                 $field->field_options['custom_html'] = $new_default_html;
 				$wpdb->update( $this->fields, array( 'field_options' => maybe_serialize( $field->field_options ) ), array( 'id' => $field->id ) );
             }
-            unset($field);
+            unset( $field );
         }
-        unset($default_html, $old_default_html, $fields);
+        unset( $default_html, $old_default_html, $fields );
     }
 
     private function migrate_to_4() {
@@ -808,6 +808,6 @@ 
 
 	public static function get_records( $table, $args = array(), $order_by = '', $limit = '', $fields = '*' ) {
 		_deprecated_function( __FUNCTION__, '2.0', 'FrmDb::get_results' );
-		return self::get_results( $table, $args, $fields, compact('order_by', 'limit') );
+		return self::get_results( $table, $args, $fields, compact( 'order_by', 'limit' ) );
 	}
 }

Indentation +338 added lines, -338 removed lines

@@ -1,64 +1,64 @@ 
 <?php
 
 class FrmDb {
-    var $fields;
-    var $forms;
-    var $entries;
-    var $entry_metas;
-
-    public function __construct() {
-        if ( ! defined('ABSPATH') ) {
-            die('You are not allowed to call this page directly.');
-        }
-
-        global $wpdb;
-        $this->fields         = $wpdb->prefix . 'frm_fields';
-        $this->forms          = $wpdb->prefix . 'frm_forms';
-        $this->entries        = $wpdb->prefix . 'frm_items';
-        $this->entry_metas    = $wpdb->prefix . 'frm_item_metas';
-    }
-
-    public function upgrade( $old_db_version = false ) {
-        global $wpdb;
-        //$frm_db_version is the version of the database we're moving to
-        $frm_db_version = FrmAppHelper::$db_version;
-        $old_db_version = (float) $old_db_version;
-        if ( ! $old_db_version ) {
-            $old_db_version = get_option('frm_db_version');
-        }
-
-        if ( $frm_db_version != $old_db_version ) {
+	var $fields;
+	var $forms;
+	var $entries;
+	var $entry_metas;
+
+	public function __construct() {
+		if ( ! defined('ABSPATH') ) {
+			die('You are not allowed to call this page directly.');
+		}
+
+		global $wpdb;
+		$this->fields         = $wpdb->prefix . 'frm_fields';
+		$this->forms          = $wpdb->prefix . 'frm_forms';
+		$this->entries        = $wpdb->prefix . 'frm_items';
+		$this->entry_metas    = $wpdb->prefix . 'frm_item_metas';
+	}
+
+	public function upgrade( $old_db_version = false ) {
+		global $wpdb;
+		//$frm_db_version is the version of the database we're moving to
+		$frm_db_version = FrmAppHelper::$db_version;
+		$old_db_version = (float) $old_db_version;
+		if ( ! $old_db_version ) {
+			$old_db_version = get_option('frm_db_version');
+		}
+
+		if ( $frm_db_version != $old_db_version ) {
 			// update rewrite rules for views and other custom post types
 			flush_rewrite_rules();
 
 			require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
-            $this->create_tables();
-            $this->migrate_data($frm_db_version, $old_db_version);
+			$this->create_tables();
+			$this->migrate_data($frm_db_version, $old_db_version);
 
-            /***** SAVE DB VERSION *****/
-            update_option('frm_db_version', $frm_db_version);
+			/***** SAVE DB VERSION *****/
+			update_option('frm_db_version', $frm_db_version);
 
-            /**** ADD/UPDATE DEFAULT TEMPLATES ****/
-            FrmXMLController::add_default_templates();
-        }
+			/**** ADD/UPDATE DEFAULT TEMPLATES ****/
+			FrmXMLController::add_default_templates();
+		}
 
-        do_action('frm_after_install');
+		do_action('frm_after_install');
 
-        /**** update the styling settings ****/
+		/**** update the styling settings ****/
 		if ( is_admin() && function_exists( 'get_filesystem_method' ) ) {
 			$frm_style = new FrmStyle();
 			$frm_style->update( 'default' );
 		}
-    }
+	}
 
-    public function collation() {
-        global $wpdb;
-        if ( ! $wpdb->has_cap( 'collation' ) ) {
-            return '';
-        }
+	public function collation() {
+		global $wpdb;
+		if ( ! $wpdb->has_cap( 'collation' ) ) {
+			return '';
+		}
 
-        $charset_collate = '';
+		$charset_collate = '';
 		if ( ! empty( $wpdb->charset ) ) {
 			$charset_collate .= ' DEFAULT CHARACTER SET ' . $wpdb->charset;
 		}
@@ -67,14 +67,14 @@ 
 			$charset_collate .= ' COLLATE ' . $wpdb->collate;
 		}
 
-        return $charset_collate;
-    }
+		return $charset_collate;
+	}
 
-    private function create_tables() {
-        $charset_collate = $this->collation();
-        $sql = array();
+	private function create_tables() {
+		$charset_collate = $this->collation();
+		$sql = array();
 
-        /* Create/Upgrade Fields Table */
+		/* Create/Upgrade Fields Table */
 		$sql[] = 'CREATE TABLE ' . $this->fields . ' (
                 id int(11) NOT NULL auto_increment,
 				field_key varchar(100) default NULL,
@@ -93,7 +93,7 @@ 
                 UNIQUE KEY field_key (field_key)
         )';
 
-        /* Create/Upgrade Forms Table */
+		/* Create/Upgrade Forms Table */
 		$sql[] = 'CREATE TABLE ' . $this->forms . ' (
                 id int(11) NOT NULL auto_increment,
 				form_key varchar(100) default NULL,
@@ -111,7 +111,7 @@ 
                 UNIQUE KEY form_key (form_key)
         )';
 
-        /* Create/Upgrade Items Table */
+		/* Create/Upgrade Items Table */
 		$sql[] = 'CREATE TABLE ' . $this->entries . ' (
                 id int(11) NOT NULL auto_increment,
 				item_key varchar(100) default NULL,
@@ -134,7 +134,7 @@ 
                 UNIQUE KEY item_key (item_key)
         )';
 
-        /* Create/Upgrade Meta Table */
+		/* Create/Upgrade Meta Table */
 		$sql[] = 'CREATE TABLE ' . $this->entry_metas . ' (
                 id int(11) NOT NULL auto_increment,
                 meta_value longtext default NULL,
@@ -146,43 +146,43 @@ 
                 KEY item_id (item_id)
         )';
 
-        foreach ( $sql as $q ) {
+		foreach ( $sql as $q ) {
 			if ( function_exists( 'dbDelta' ) ) {
 				dbDelta( $q . $charset_collate . ';' );
 			} else {
 				global $wpdb;
 				$wpdb->query( $q . $charset_collate );
 			}
-            unset($q);
-        }
-    }
+			unset($q);
+		}
+	}
 
-    /**
-     * @param integer $frm_db_version
+	/**
+	 * @param integer $frm_db_version
 	 * @param int $old_db_version
-     */
+	 */
 	private function migrate_data( $frm_db_version, $old_db_version ) {
 		$migrations = array( 4, 6, 11, 16, 17, 23, 25 );
-        foreach ( $migrations as $migration ) {
-            if ( $frm_db_version >= $migration && $old_db_version < $migration ) {
+		foreach ( $migrations as $migration ) {
+			if ( $frm_db_version >= $migration && $old_db_version < $migration ) {
 				$function_name = 'migrate_to_' . $migration;
-                $this->$function_name();
-            }
-        }
-    }
+				$this->$function_name();
+			}
+		}
+	}
 
-    /**
-     * Change array into format $wpdb->prepare can use
+	/**
+	 * Change array into format $wpdb->prepare can use
 	 *
 	 * @param array $args
 	 * @param string $starts_with
-     */
-    public static function get_where_clause_and_values( &$args, $starts_with = ' WHERE ' ) {
-        if ( empty($args) ) {
+	 */
+	public static function get_where_clause_and_values( &$args, $starts_with = ' WHERE ' ) {
+		if ( empty($args) ) {
 			// add an arg to prevent prepare from failing
 			$args = array( 'where' => $starts_with . '1=%d', 'values' => array( 1 ) );
 			return;
-        }
+		}
 
 		$where = '';
 		$values = array();
@@ -193,64 +193,64 @@ 
 		}
 
 		$args = compact( 'where', 'values' );
-    }
+	}
 
-    /**
+	/**
 	 * @param array $args
-     * @param string $base_where
-     * @param string $where
+	 * @param string $base_where
+	 * @param string $where
 	 * @param array $values
-     */
-    public static function parse_where_from_array( $args, $base_where, &$where, &$values ) {
-        $condition = ' AND';
-        if ( isset( $args['or'] ) ) {
-            $condition = ' OR';
-            unset( $args['or'] );
-        }
-
-        foreach ( $args as $key => $value ) {
-            $where .= empty( $where ) ? $base_where : $condition;
-            $array_inc_null = ( ! is_numeric( $key ) && is_array( $value ) && in_array( null, $value ) );
-            if ( is_numeric( $key ) || $array_inc_null ) {
-                $where .= ' ( ';
-                $nested_where = '';
-                if ( $array_inc_null ) {
-                    foreach ( $value as $val ) {
-                        self::parse_where_from_array( array( $key => $val, 'or' => 1 ), '', $nested_where, $values );
-                    }
-                } else {
-                    self::parse_where_from_array( $value, '', $nested_where, $values );
-                }
-                $where .= $nested_where;
-                $where .= ' ) ';
-            } else {
-                self::interpret_array_to_sql( $key, $value, $where, $values );
-            }
-        }
-    }
-
-    /**
-     * @param string $key
+	 */
+	public static function parse_where_from_array( $args, $base_where, &$where, &$values ) {
+		$condition = ' AND';
+		if ( isset( $args['or'] ) ) {
+			$condition = ' OR';
+			unset( $args['or'] );
+		}
+
+		foreach ( $args as $key => $value ) {
+			$where .= empty( $where ) ? $base_where : $condition;
+			$array_inc_null = ( ! is_numeric( $key ) && is_array( $value ) && in_array( null, $value ) );
+			if ( is_numeric( $key ) || $array_inc_null ) {
+				$where .= ' ( ';
+				$nested_where = '';
+				if ( $array_inc_null ) {
+					foreach ( $value as $val ) {
+						self::parse_where_from_array( array( $key => $val, 'or' => 1 ), '', $nested_where, $values );
+					}
+				} else {
+					self::parse_where_from_array( $value, '', $nested_where, $values );
+				}
+				$where .= $nested_where;
+				$where .= ' ) ';
+			} else {
+				self::interpret_array_to_sql( $key, $value, $where, $values );
+			}
+		}
+	}
+
+	/**
+	 * @param string $key
 	 * @param string|array $value
-     * @param string $where
+	 * @param string $where
 	 * @param array $values
-     */
-    private static function interpret_array_to_sql( $key, $value, &$where, &$values ) {
+	 */
+	private static function interpret_array_to_sql( $key, $value, &$where, &$values ) {
 		$key = trim( $key );
 
-        if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false  ) {
-            $k = explode(' ', $key);
-            $where .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key );
-            $values[] = '%Y-%m-%d %H:%i:%s';
-        } else {
+		if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false  ) {
+			$k = explode(' ', $key);
+			$where .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key );
+			$values[] = '%Y-%m-%d %H:%i:%s';
+		} else {
 			$where .= ' ' . $key;
-        }
+		}
 
 		$lowercase_key = explode( ' ', strtolower( $key ) );
 		$lowercase_key = end( $lowercase_key );
 
-        if ( is_array( $value ) ) {
-            // translate array of values to "in"
+		if ( is_array( $value ) ) {
+			// translate array of values to "in"
 			if ( strpos( $lowercase_key, 'like' ) !== false ) {
 				$where = preg_replace('/' . $key . '$/', '', $where);
 				$where .= '(';
@@ -268,7 +268,7 @@ 
 				$where .= ' in (' . FrmAppHelper::prepare_array_values( $value, '%s' ) . ')';
 				$values = array_merge( $values, $value );
 			}
-        } else if ( strpos( $lowercase_key, 'like' ) !== false ) {
+		} else if ( strpos( $lowercase_key, 'like' ) !== false ) {
 			/**
 			 * Allow string to start or end with the value
 			 * If the key is like% then skip the first % for starts with
@@ -287,9 +287,9 @@ 
 			$where .= ' %s';
 			$values[] = $start . FrmAppHelper::esc_like( $value ) . $end;
 
-        } else if ( $value === null ) {
-            $where .= ' IS NULL';
-        } else {
+		} else if ( $value === null ) {
+			$where .= ' IS NULL';
+		} else {
 			// allow a - to prevent = from being added
 			if ( substr( $key, -1 ) == '-' ) {
 				$where = rtrim( $where, '-' );
@@ -299,9 +299,9 @@ 
 
 			self::add_query_placeholder( $key, $value, $where );
 
-            $values[] = $value;
-        }
-    }
+			$values[] = $value;
+		}
+	}
 
 	/**
 	 * Add %d, or %s to query
@@ -311,7 +311,7 @@ 
 	 * @param int|string $value
 	 * @param string $where
 	 */
-    private static function add_query_placeholder( $key, $value, &$where ) {
+	private static function add_query_placeholder( $key, $value, &$where ) {
 		if ( is_numeric( $value ) && strpos( $key, 'meta_value' ) === false ) {
 			$where .= '%d';
 		} else {
@@ -319,16 +319,16 @@ 
 		}
 	}
 
-    /**
-     * @param string $table
+	/**
+	 * @param string $table
 	 * @param array $where
 	 * @param array $args
 	 * @return int
-     */
-    public static function get_count( $table, $where = array(), $args = array() ) {
-        $count = self::get_var( $table, $where, 'COUNT(*)', $args );
-        return $count;
-    }
+	 */
+	public static function get_count( $table, $where = array(), $args = array() ) {
+		$count = self::get_var( $table, $where, 'COUNT(*)', $args );
+		return $count;
+	}
 
 	/**
 	 * @param string $table
@@ -339,56 +339,56 @@ 
 	 * @param string $type
 	 * @return array|null|string|object
 	 */
-    public static function get_var( $table, $where = array(), $field = 'id', $args = array(), $limit = '', $type = 'var' ) {
-        $group = '';
-        self::get_group_and_table_name( $table, $group );
+	public static function get_var( $table, $where = array(), $field = 'id', $args = array(), $limit = '', $type = 'var' ) {
+		$group = '';
+		self::get_group_and_table_name( $table, $group );
 		self::convert_options_to_array( $args, '', $limit );
 
 		$query = self::generate_query_string_from_pieces( $field, $table, $where, $args );
 
 		$cache_key = str_replace( array( ' ', ',' ), '_', trim( implode( '_', FrmAppHelper::array_flatten( $where ) ) . implode( '_', $args ) . $field . '_' . $type, ' WHERE' ) );
 		$results = FrmAppHelper::check_cache( $cache_key, $group, $query, 'get_' . $type );
-        return $results;
-    }
+		return $results;
+	}
 
-    /**
-     * @param string $table
-     * @param array $where
+	/**
+	 * @param string $table
+	 * @param array $where
 	 * @param string $field
 	 * @param array $args
 	 * @param string $limit
 	 * @return mixed
-     */
-    public static function get_col( $table, $where = array(), $field = 'id', $args = array(), $limit = '' ) {
-        return self::get_var( $table, $where, $field, $args, $limit, 'col' );
-    }
-
-    /**
-     * @since 2.0
-     * @param string $table
+	 */
+	public static function get_col( $table, $where = array(), $field = 'id', $args = array(), $limit = '' ) {
+		return self::get_var( $table, $where, $field, $args, $limit, 'col' );
+	}
+
+	/**
+	 * @since 2.0
+	 * @param string $table
 	 * @param array $where
 	 * @param string $fields
 	 * @param array $args
 	 * @return mixed
-     */
-    public static function get_row( $table, $where = array(), $fields = '*', $args = array() ) {
-        $args['limit'] = 1;
-        return self::get_var( $table, $where, $fields, $args, '', 'row' );
-    }
-
-    /**
-     * Prepare a key/value array before DB call
+	 */
+	public static function get_row( $table, $where = array(), $fields = '*', $args = array() ) {
+		$args['limit'] = 1;
+		return self::get_var( $table, $where, $fields, $args, '', 'row' );
+	}
+
+	/**
+	 * Prepare a key/value array before DB call
 	 *
-     * @since 2.0
-     * @param string $table
+	 * @since 2.0
+	 * @param string $table
 	 * @param array $where
 	 * @param string $fields
 	 * @param array $args
 	 * @return mixed
-     */
-    public static function get_results( $table, $where = array(), $fields = '*', $args = array() ) {
-        return self::get_var( $table, $where, $fields, $args, '', 'results' );
-    }
+	 */
+	public static function get_results( $table, $where = array(), $fields = '*', $args = array() ) {
+		return self::get_var( $table, $where, $fields, $args, '', 'results' );
+	}
 
 	/**
 	 * Check for like, not like, in, not in, =, !=, >, <, <=, >=
@@ -425,59 +425,59 @@ 
 		return '';
 	}
 
-    /**
-     * Get 'frm_forms' from wp_frm_forms or a longer table param that includes a join
-     * Also add the wpdb->prefix to the table if it's missing
-     *
-     * @param string $table
-     * @param string $group
-     */
-    private static function get_group_and_table_name( &$table, &$group ) {
+	/**
+	 * Get 'frm_forms' from wp_frm_forms or a longer table param that includes a join
+	 * Also add the wpdb->prefix to the table if it's missing
+	 *
+	 * @param string $table
+	 * @param string $group
+	 */
+	private static function get_group_and_table_name( &$table, &$group ) {
 		global $wpdb, $wpmuBaseTablePrefix;
 
-        $table_parts = explode(' ', $table);
-        $group = reset($table_parts);
-        $group = str_replace( $wpdb->prefix, '', $group );
+		$table_parts = explode(' ', $table);
+		$group = reset($table_parts);
+		$group = str_replace( $wpdb->prefix, '', $group );
 
 		$prefix = $wpmuBaseTablePrefix ? $wpmuBaseTablePrefix : $wpdb->base_prefix;
 		$group = str_replace( $prefix, '', $group );
 
-        if ( $group == $table ) {
-            $table = $wpdb->prefix . $table;
-        }
+		if ( $group == $table ) {
+			$table = $wpdb->prefix . $table;
+		}
 
 		// switch to singular group name
 		$group = rtrim( $group, 's' );
-    }
+	}
 
-    private static function convert_options_to_array( &$args, $order_by = '', $limit = '' ) {
-        if ( ! is_array($args) ) {
+	private static function convert_options_to_array( &$args, $order_by = '', $limit = '' ) {
+		if ( ! is_array($args) ) {
 			$args = array( 'order_by' => $args );
-        }
+		}
 
-        if ( ! empty( $order_by ) ) {
-            $args['order_by'] = $order_by;
-        }
+		if ( ! empty( $order_by ) ) {
+			$args['order_by'] = $order_by;
+		}
 
-        if ( ! empty( $limit ) ) {
-            $args['limit'] = $limit;
-        }
+		if ( ! empty( $limit ) ) {
+			$args['limit'] = $limit;
+		}
 
-        $temp_args = $args;
-        foreach ( $temp_args as $k => $v ) {
-            if ( $v == '' ) {
+		$temp_args = $args;
+		foreach ( $temp_args as $k => $v ) {
+			if ( $v == '' ) {
 				unset( $args[ $k ] );
-                continue;
-            }
+				continue;
+			}
 
-            if ( $k == 'limit' ) {
+			if ( $k == 'limit' ) {
 				$args[ $k ] = FrmAppHelper::esc_limit( $v );
-            }
-            $db_name = strtoupper( str_replace( '_', ' ', $k ) );
-            if ( strpos( $v, $db_name ) === false ) {
+			}
+			$db_name = strtoupper( str_replace( '_', ' ', $k ) );
+			if ( strpos( $v, $db_name ) === false ) {
 				$args[ $k ] = $db_name . ' ' . $v;
-            }
-        }
+			}
+		}
 
 		// Make sure LIMIT is the last argument
 		if ( isset( $args['order_by'] ) && isset( $args['limit'] ) ) {
@@ -485,7 +485,7 @@ 
 			unset( $args['limit'] );
 			$args['limit'] = $temp_limit;
 		}
-    }
+	}
 
 	/**
 	 * Get the associative array results for the given columns, table, and where query
@@ -538,31 +538,31 @@ 
 		return $query;
 	}
 
-    public function uninstall() {
+	public function uninstall() {
 		if ( ! current_user_can( 'administrator' ) ) {
-            $frm_settings = FrmAppHelper::get_settings();
-            wp_die($frm_settings->admin_permission);
-        }
+			$frm_settings = FrmAppHelper::get_settings();
+			wp_die($frm_settings->admin_permission);
+		}
 
-        global $wpdb, $wp_roles;
+		global $wpdb, $wp_roles;
 
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->fields );
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->forms );
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->entries );
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->entry_metas );
 
-        delete_option('frm_options');
-        delete_option('frm_db_version');
+		delete_option('frm_options');
+		delete_option('frm_db_version');
 
-        //delete roles
-        $frm_roles = FrmAppHelper::frm_capabilities();
-        $roles = get_editable_roles();
-        foreach ( $frm_roles as $frm_role => $frm_role_description ) {
-            foreach ( $roles as $role => $details ) {
-                $wp_roles->remove_cap( $role, $frm_role );
-                unset($role, $details);
-    		}
-    		unset($frm_role, $frm_role_description);
+		//delete roles
+		$frm_roles = FrmAppHelper::frm_capabilities();
+		$roles = get_editable_roles();
+		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
+			foreach ( $roles as $role => $details ) {
+				$wp_roles->remove_cap( $role, $frm_role );
+				unset($role, $details);
+			}
+			unset($frm_role, $frm_role_description);
 		}
 		unset($roles, $frm_roles);
 
@@ -586,9 +586,9 @@ 
 
 		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->options . ' WHERE option_name LIKE %s OR option_name LIKE %s', '_transient_timeout_frm_form_fields_%', '_transient_frm_form_fields_%' ) );
 
-        do_action('frm_after_uninstall');
-        return true;
-    }
+		do_action('frm_after_uninstall');
+		return true;
+	}
 
 	/**
 	 * Migrate old styling settings. If sites are using the old
@@ -627,150 +627,150 @@ 
 		}
 	}
 
-    /**
-     * Change field size from character to pixel -- Multiply by 9
-     */
-    private function migrate_to_17() {
-        global $wpdb;
+	/**
+	 * Change field size from character to pixel -- Multiply by 9
+	 */
+	private function migrate_to_17() {
+		global $wpdb;
 		$pixel_conversion = 9;
 
-        // Get query arguments
+		// Get query arguments
 		$field_types = array( 'textarea', 'text', 'number', 'email', 'url', 'rte', 'date', 'phone', 'password', 'image', 'tag', 'file' );
 		$query = array( 'type' => $field_types, 'field_options like' => 's:4:"size";', 'field_options not like' => 's:4:"size";s:0:' );
 
-        // Get results
+		// Get results
 		$fields = FrmDb::get_results( $this->fields, $query, 'id, field_options' );
 
-        $updated = 0;
-        foreach ( $fields as $f ) {
-            $f->field_options = maybe_unserialize($f->field_options);
-            if ( empty($f->field_options['size']) || ! is_numeric($f->field_options['size']) ) {
-                continue;
-            }
+		$updated = 0;
+		foreach ( $fields as $f ) {
+			$f->field_options = maybe_unserialize($f->field_options);
+			if ( empty($f->field_options['size']) || ! is_numeric($f->field_options['size']) ) {
+				continue;
+			}
 
 			$f->field_options['size'] = round( $pixel_conversion * (int) $f->field_options['size'] );
-            $f->field_options['size'] .= 'px';
-            $u = FrmField::update( $f->id, array( 'field_options' => $f->field_options ) );
-            if ( $u ) {
-                $updated++;
-            }
-            unset($f);
-        }
-
-        // Change the characters in widgets to pixels
-        $widgets = get_option('widget_frm_show_form');
-        if ( empty($widgets) ) {
-            return;
-        }
-
-        $widgets = maybe_unserialize($widgets);
-        foreach ( $widgets as $k => $widget ) {
-            if ( ! is_array($widget) || ! isset($widget['size']) ) {
-                continue;
-            }
+			$f->field_options['size'] .= 'px';
+			$u = FrmField::update( $f->id, array( 'field_options' => $f->field_options ) );
+			if ( $u ) {
+				$updated++;
+			}
+			unset($f);
+		}
+
+		// Change the characters in widgets to pixels
+		$widgets = get_option('widget_frm_show_form');
+		if ( empty($widgets) ) {
+			return;
+		}
+
+		$widgets = maybe_unserialize($widgets);
+		foreach ( $widgets as $k => $widget ) {
+			if ( ! is_array($widget) || ! isset($widget['size']) ) {
+				continue;
+			}
 			$size = round( $pixel_conversion * (int) $widget['size'] );
-            $size .= 'px';
+			$size .= 'px';
 			$widgets[ $k ]['size'] = $size;
-        }
-        update_option('widget_frm_show_form', $widgets);
-    }
-
-    /**
-     * Migrate post and email notification settings into actions
-     */
-    private function migrate_to_16() {
-        global $wpdb;
-
-        $forms = FrmDb::get_results( $this->forms, array(), 'id, options, is_template, default_template' );
-
-        /**
-        * Old email settings format:
-        * email_to: Email or field id
-        * also_email_to: array of fields ids
-        * reply_to: Email, field id, 'custom'
-        * cust_reply_to: string
-        * reply_to_name: field id, 'custom'
-        * cust_reply_to_name: string
-        * plain_text: 0|1
-        * email_message: string or ''
-        * email_subject: string or ''
-        * inc_user_info: 0|1
-        * update_email: 0, 1, 2
-        *
-        * Old autoresponder settings format:
-        * auto_responder: 0|1
-        * ar_email_message: string or ''
-        * ar_email_to: field id
-        * ar_plain_text: 0|1
-        * ar_reply_to_name: string
-        * ar_reply_to: string
-        * ar_email_subject: string
-        * ar_update_email: 0, 1, 2
-        *
-        * New email settings:
-        * post_content: json settings
-        * post_title: form id
-        * post_excerpt: message
-        *
-        */
-
-        foreach ( $forms as $form ) {
+		}
+		update_option('widget_frm_show_form', $widgets);
+	}
+
+	/**
+	 * Migrate post and email notification settings into actions
+	 */
+	private function migrate_to_16() {
+		global $wpdb;
+
+		$forms = FrmDb::get_results( $this->forms, array(), 'id, options, is_template, default_template' );
+
+		/**
+		 * Old email settings format:
+		 * email_to: Email or field id
+		 * also_email_to: array of fields ids
+		 * reply_to: Email, field id, 'custom'
+		 * cust_reply_to: string
+		 * reply_to_name: field id, 'custom'
+		 * cust_reply_to_name: string
+		 * plain_text: 0|1
+		 * email_message: string or ''
+		 * email_subject: string or ''
+		 * inc_user_info: 0|1
+		 * update_email: 0, 1, 2
+		 *
+		 * Old autoresponder settings format:
+		 * auto_responder: 0|1
+		 * ar_email_message: string or ''
+		 * ar_email_to: field id
+		 * ar_plain_text: 0|1
+		 * ar_reply_to_name: string
+		 * ar_reply_to: string
+		 * ar_email_subject: string
+		 * ar_update_email: 0, 1, 2
+		 *
+		 * New email settings:
+		 * post_content: json settings
+		 * post_title: form id
+		 * post_excerpt: message
+		 *
+		 */
+
+		foreach ( $forms as $form ) {
 			if ( $form->is_template && $form->default_template ) {
 				// don't migrate the default templates since the email will be added anyway
 				continue;
 			}
 
-            // Format form options
-            $form_options = maybe_unserialize($form->options);
+			// Format form options
+			$form_options = maybe_unserialize($form->options);
 
-            // Migrate settings to actions
-            FrmXMLHelper::migrate_form_settings_to_actions( $form_options, $form->id );
-        }
-    }
+			// Migrate settings to actions
+			FrmXMLHelper::migrate_form_settings_to_actions( $form_options, $form->id );
+		}
+	}
 
-    private function migrate_to_11() {
-        global $wpdb;
+	private function migrate_to_11() {
+		global $wpdb;
 
-        $forms = FrmDb::get_results( $this->forms, array(), 'id, options');
+		$forms = FrmDb::get_results( $this->forms, array(), 'id, options');
 
-        $sending = __( 'Sending', 'formidable' );
+		$sending = __( 'Sending', 'formidable' );
 		$img = FrmAppHelper::plugin_url() . '/images/ajax_loader.gif';
-        $old_default_html = <<<DEFAULT_HTML
+		$old_default_html = <<<DEFAULT_HTML
 <div class="frm_submit">
 [if back_button]<input type="submit" value="[back_label]" name="frm_prev_page" formnovalidate="formnovalidate" [back_hook] />[/if back_button]
 <input type="submit" value="[button_label]" [button_action] />
 <img class="frm_ajax_loading" src="$img" alt="$sending" style="visibility:hidden;" />
 </div>
 DEFAULT_HTML;
-        unset($sending, $img);
+		unset($sending, $img);
 
-        $new_default_html = FrmFormsHelper::get_default_html('submit');
-        $draft_link = FrmFormsHelper::get_draft_link();
+		$new_default_html = FrmFormsHelper::get_default_html('submit');
+		$draft_link = FrmFormsHelper::get_draft_link();
 		foreach ( $forms as $form ) {
-            $form->options = maybe_unserialize($form->options);
-            if ( ! isset($form->options['submit_html']) || empty($form->options['submit_html']) ) {
-                continue;
-            }
+			$form->options = maybe_unserialize($form->options);
+			if ( ! isset($form->options['submit_html']) || empty($form->options['submit_html']) ) {
+				continue;
+			}
 
-            if ( $form->options['submit_html'] != $new_default_html && $form->options['submit_html'] == $old_default_html ) {
-                $form->options['submit_html'] = $new_default_html;
+			if ( $form->options['submit_html'] != $new_default_html && $form->options['submit_html'] == $old_default_html ) {
+				$form->options['submit_html'] = $new_default_html;
 				$wpdb->update( $this->forms, array( 'options' => serialize( $form->options ) ), array( 'id' => $form->id ) );
 			} else if ( ! strpos( $form->options['submit_html'], 'save_draft' ) ) {
 				$form->options['submit_html'] = preg_replace( '~\<\/div\>(?!.*\<\/div\>)~', $draft_link . "\r\n</div>", $form->options['submit_html'] );
 				$wpdb->update( $this->forms, array( 'options' => serialize( $form->options ) ), array( 'id' => $form->id ) );
-            }
-            unset($form);
-        }
-        unset($forms);
-    }
+			}
+			unset($form);
+		}
+		unset($forms);
+	}
 
-    private function migrate_to_6() {
-        global $wpdb;
+	private function migrate_to_6() {
+		global $wpdb;
 
 		$no_save = array_merge( FrmField::no_save_fields(), array( 'form', 'hidden', 'user_id' ) );
 		$fields = FrmDb::get_results( $this->fields, array( 'type NOT' => $no_save ), 'id, field_options' );
 
-        $default_html = <<<DEFAULT_HTML
+		$default_html = <<<DEFAULT_HTML
 <div id="frm_field_[id]_container" class="form-field [required_class] [error_class]">
     <label class="frm_pos_[label_position]">[field_name]
         <span class="frm_required">[required_label]</span>
@@ -780,7 +780,7 @@ 
 </div>
 DEFAULT_HTML;
 
-        $old_default_html = <<<DEFAULT_HTML
+		$old_default_html = <<<DEFAULT_HTML
 <div id="frm_field_[id]_container" class="form-field [required_class] [error_class]">
     <label class="frm_pos_[label_position]">[field_name]
         <span class="frm_required">[required_label]</span>
@@ -790,25 +790,25 @@ 
 </div>
 DEFAULT_HTML;
 
-        $new_default_html = FrmFieldsHelper::get_default_html('text');
-        foreach ( $fields as $field ) {
-            $field->field_options = maybe_unserialize($field->field_options);
+		$new_default_html = FrmFieldsHelper::get_default_html('text');
+		foreach ( $fields as $field ) {
+			$field->field_options = maybe_unserialize($field->field_options);
 			if ( ! FrmField::is_option_empty( $field, 'custom_html' ) || $field->field_options['custom_html'] == $default_html || $field->field_options['custom_html'] == $old_default_html ) {
-                $field->field_options['custom_html'] = $new_default_html;
+				$field->field_options['custom_html'] = $new_default_html;
 				$wpdb->update( $this->fields, array( 'field_options' => maybe_serialize( $field->field_options ) ), array( 'id' => $field->id ) );
-            }
-            unset($field);
-        }
-        unset($default_html, $old_default_html, $fields);
-    }
-
-    private function migrate_to_4() {
-        global $wpdb;
+			}
+			unset($field);
+		}
+		unset($default_html, $old_default_html, $fields);
+	}
+
+	private function migrate_to_4() {
+		global $wpdb;
 		$user_ids = FrmEntryMeta::getAll( array( 'fi.type' => 'user_id' ) );
-        foreach ( $user_ids as $user_id ) {
+		foreach ( $user_ids as $user_id ) {
 			$wpdb->update( $this->entries, array( 'user_id' => $user_id->meta_value ), array( 'id' => $user_id->item_id ) );
-        }
-    }
+		}
+	}
 
 	public static function get_one_record( $table, $args = array(), $fields = '*', $order_by = '' ) {
 		_deprecated_function( __FUNCTION__, '2.0', 'FrmDb::get_row' );

classes/models/FrmField.php

Indentation +205 added lines, -205 removed lines

@@ -4,7 +4,7 @@ 
 }
 
 class FrmField {
-    static $use_cache = true;
+	static $use_cache = true;
 	static $transient_size = 200;
 
 	public static function field_selection() {
@@ -51,39 +51,39 @@ 
 		));
 	}
 
-    public static function create( $values, $return = true ) {
-        global $wpdb, $frm_duplicate_ids;
+	public static function create( $values, $return = true ) {
+		global $wpdb, $frm_duplicate_ids;
 
-        $new_values = array();
-        $key = isset($values['field_key']) ? $values['field_key'] : $values['name'];
+		$new_values = array();
+		$key = isset($values['field_key']) ? $values['field_key'] : $values['name'];
 		$new_values['field_key'] = FrmAppHelper::get_unique_key( $key, $wpdb->prefix . 'frm_fields', 'field_key' );
 
 		foreach ( array( 'name', 'description', 'type', 'default_value' ) as $col ) {
 			$new_values[ $col ] = $values[ $col ];
-        }
+		}
 
-        $new_values['options'] = $values['options'];
+		$new_values['options'] = $values['options'];
 
-        $new_values['field_order'] = isset($values['field_order']) ? (int) $values['field_order'] : null;
-        $new_values['required'] = isset($values['required']) ? (int) $values['required'] : 0;
-        $new_values['form_id'] = isset($values['form_id']) ? (int) $values['form_id'] : null;
-        $new_values['field_options'] = $values['field_options'];
-        $new_values['created_at'] = current_time('mysql', 1);
+		$new_values['field_order'] = isset($values['field_order']) ? (int) $values['field_order'] : null;
+		$new_values['required'] = isset($values['required']) ? (int) $values['required'] : 0;
+		$new_values['form_id'] = isset($values['form_id']) ? (int) $values['form_id'] : null;
+		$new_values['field_options'] = $values['field_options'];
+		$new_values['created_at'] = current_time('mysql', 1);
 
 		if ( isset( $values['id'] ) ) {
 			$frm_duplicate_ids[ $values['field_key'] ] = $new_values['field_key'];
-            $new_values = apply_filters('frm_duplicated_field', $new_values);
-        }
+			$new_values = apply_filters('frm_duplicated_field', $new_values);
+		}
 
 		foreach ( $new_values as $k => $v ) {
-            if ( is_array( $v ) ) {
+			if ( is_array( $v ) ) {
 				$new_values[ $k ] = serialize( $v );
 			}
-            unset( $k, $v );
-        }
+			unset( $k, $v );
+		}
 
-        //if(isset($values['id']) and is_numeric($values['id']))
-        //    $new_values['id'] = $values['id'];
+		//if(isset($values['id']) and is_numeric($values['id']))
+		//    $new_values['id'] = $values['id'];
 
 		$query_results = $wpdb->insert( $wpdb->prefix . 'frm_fields', $new_values );
 		$new_id = 0;
@@ -104,22 +104,22 @@ 
 		} else {
 			return false;
 		}
-    }
+	}
 
-    public static function duplicate( $old_form_id, $form_id, $copy_keys = false, $blog_id = false ) {
-        global $frm_duplicate_ids;
+	public static function duplicate( $old_form_id, $form_id, $copy_keys = false, $blog_id = false ) {
+		global $frm_duplicate_ids;
 
 		$where = array( array( 'or' => 1, 'fi.form_id' => $old_form_id, 'fr.parent_form_id' => $old_form_id ) );
 		$fields = self::getAll( $where, 'field_order', '', $blog_id );
 
-        foreach ( (array) $fields as $field ) {
-            $new_key = ($copy_keys) ? $field->field_key : '';
-            if ( $copy_keys && substr($field->field_key, -1) == 2 ) {
-                $new_key = rtrim($new_key, 2);
-            }
+		foreach ( (array) $fields as $field ) {
+			$new_key = ($copy_keys) ? $field->field_key : '';
+			if ( $copy_keys && substr($field->field_key, -1) == 2 ) {
+				$new_key = rtrim($new_key, 2);
+			}
 
-            $values = array();
-            FrmFieldsHelper::fill_field( $values, $field, $form_id, $new_key );
+			$values = array();
+			FrmFieldsHelper::fill_field( $values, $field, $form_id, $new_key );
 
 			// If this is a repeating section, create new form
 			if ( self::is_repeating_field( $field ) ) {
@@ -138,16 +138,16 @@ 
 				$values['form_id'] = $new_repeat_form_id;
 			}
 
-            $values = apply_filters('frm_duplicated_field', $values);
-            $new_id = self::create($values);
-            $frm_duplicate_ids[ $field->id ] = $new_id;
-            $frm_duplicate_ids[ $field->field_key ] = $new_id;
-            unset($field);
-        }
-    }
+			$values = apply_filters('frm_duplicated_field', $values);
+			$new_id = self::create($values);
+			$frm_duplicate_ids[ $field->id ] = $new_id;
+			$frm_duplicate_ids[ $field->field_key ] = $new_id;
+			unset($field);
+		}
+	}
 
 	public static function update( $id, $values ) {
-        global $wpdb;
+		global $wpdb;
 
 		$id = absint( $id );
 
@@ -155,9 +155,9 @@ 
 			$values['field_key'] = FrmAppHelper::get_unique_key( $values['field_key'], $wpdb->prefix . 'frm_fields', 'field_key', $id );
 		}
 
-        if ( isset($values['required']) ) {
-            $values['required'] = (int) $values['required'];
-        }
+		if ( isset($values['required']) ) {
+			$values['required'] = (int) $values['required'];
+		}
 
 		self::preserve_format_option_backslashes( $values );
 
@@ -174,41 +174,41 @@ 
 
 		$query_results = $wpdb->update( $wpdb->prefix . 'frm_fields', $values, array( 'id' => $id ) );
 
-        $form_id = 0;
+		$form_id = 0;
 		if ( isset( $values['form_id'] ) ) {
-            $form_id = absint( $values['form_id'] );
+			$form_id = absint( $values['form_id'] );
 		} else {
-            $field = self::getOne($id);
-            if ( $field ) {
-                $form_id = $field->form_id;
-            }
-            unset($field);
-        }
-        unset($values);
+			$field = self::getOne($id);
+			if ( $field ) {
+				$form_id = $field->form_id;
+			}
+			unset($field);
+		}
+		unset($values);
 
 		if ( $query_results ) {
-            wp_cache_delete( $id, 'frm_field' );
-            if ( $form_id ) {
-                self::delete_form_transient( $form_id );
-            }
-        }
+			wp_cache_delete( $id, 'frm_field' );
+			if ( $form_id ) {
+				self::delete_form_transient( $form_id );
+			}
+		}
 
-        return $query_results;
-    }
+		return $query_results;
+	}
 
 	/**
-	* Keep backslashes in the phone format option
-	*
-	* @since 2.0.8
-	* @param $values array - pass by reference
-	*/
+	 * Keep backslashes in the phone format option
+	 *
+	 * @since 2.0.8
+	 * @param $values array - pass by reference
+	 */
 	private static function preserve_format_option_backslashes( &$values ) {
 		if ( isset( $values['field_options']['format'] ) ) {
 			$values['field_options']['format'] = FrmAppHelper::preserve_backslashes( $values['field_options']['format'] );
 		}
 	}
 
-    public static function destroy( $id ) {
+	public static function destroy( $id ) {
 		global $wpdb;
 
 		do_action( 'frm_before_destroy_field', $id );
@@ -223,7 +223,7 @@ 
 
 		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_item_metas WHERE field_id=%d', $id ) );
 		return $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_fields WHERE id=%d', $id ) );
-    }
+	}
 
 	public static function delete_form_transient( $form_id ) {
 		$form_id = absint( $form_id );
@@ -236,17 +236,17 @@ 
 		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->options . ' WHERE option_name LIKE %s OR option_name LIKE %s OR option_name LIKE %s OR option_name LIKE %s', '_transient_timeout_frm_form_fields_' . $form_id . 'ex%', '_transient_frm_form_fields_' . $form_id . 'ex%', '_transient_timeout_frm_form_fields_' . $form_id . 'in%', '_transient_frm_form_fields_' . $form_id . 'in%' ) );
 
 		$cache_key = serialize( array( 'fi.form_id' => $form_id ) ) . 'field_orderlb';
-        wp_cache_delete($cache_key, 'frm_field');
+		wp_cache_delete($cache_key, 'frm_field');
 
 		// this cache key is autogenerated in FrmDb::get_var
 		wp_cache_delete( '(__fi.form_id=%d_OR_fr.parent_form_id=%d_)__' . $form_id . '_' . $form_id . '_ORDER_BY_field_orderfi.*__fr.name_as_form_name_results', 'frm_field' );
 		wp_cache_delete( '1_' . $form_id . '_' . $form_id . '_ORDER_BY_field_orderfi.*__fr.name_as_form_name_results', 'frm_field' );
 
-        $form = FrmForm::getOne($form_id);
-        if ( $form && $form->parent_form_id ) {
-            self::delete_form_transient( $form->parent_form_id );
-        }
-    }
+		$form = FrmForm::getOne($form_id);
+		if ( $form && $form->parent_form_id ) {
+			self::delete_form_transient( $form->parent_form_id );
+		}
+	}
 
 	/**
 	 * If $field is numeric, get the field object
@@ -262,131 +262,131 @@ 
 			return;
 		}
 
-        global $wpdb;
+		global $wpdb;
 
-        $where = is_numeric($id) ? 'id=%d' : 'field_key=%s';
+		$where = is_numeric($id) ? 'id=%d' : 'field_key=%s';
 		$query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->prefix . 'frm_fields WHERE ' . $where, $id );
 
-        $results = FrmAppHelper::check_cache( $id, 'frm_field', $query, 'get_row', 0 );
+		$results = FrmAppHelper::check_cache( $id, 'frm_field', $query, 'get_row', 0 );
 
-        if ( empty($results) ) {
-            return $results;
-        }
+		if ( empty($results) ) {
+			return $results;
+		}
 
-        if ( is_numeric($id) ) {
-            wp_cache_set( $results->field_key, $results, 'frm_field' );
-        } else if ( $results ) {
-            wp_cache_set( $results->id, $results, 'frm_field' );
-        }
+		if ( is_numeric($id) ) {
+			wp_cache_set( $results->field_key, $results, 'frm_field' );
+		} else if ( $results ) {
+			wp_cache_set( $results->id, $results, 'frm_field' );
+		}
 
 		self::prepare_options( $results );
 
-        return stripslashes_deep($results);
-    }
+		return stripslashes_deep($results);
+	}
 
-    /**
-     * Get the field type by key or id
-     * @param int|string The field id or key
+	/**
+	 * Get the field type by key or id
+	 * @param int|string The field id or key
 	 * @param mixed $col The name of the column in the fields database table
-     */
-    public static function &get_type( $id, $col = 'type' ) {
-        $field = FrmAppHelper::check_cache( $id, 'frm_field' );
-        if ( $field ) {
-            $type = $field->{$col};
-        } else {
-            $type = FrmDb::get_var( 'frm_fields', array( 'or' => 1, 'id' => $id, 'field_key' => $id ), $col );
-        }
-
-        return $type;
-    }
+	 */
+	public static function &get_type( $id, $col = 'type' ) {
+		$field = FrmAppHelper::check_cache( $id, 'frm_field' );
+		if ( $field ) {
+			$type = $field->{$col};
+		} else {
+			$type = FrmDb::get_var( 'frm_fields', array( 'or' => 1, 'id' => $id, 'field_key' => $id ), $col );
+		}
+
+		return $type;
+	}
 
 	public static function get_all_types_in_form( $form_id, $type, $limit = '', $inc_sub = 'exclude' ) {
-        if ( ! $form_id ) {
-            return array();
-        }
+		if ( ! $form_id ) {
+			return array();
+		}
 
 		$results = self::get_fields_from_transients( $form_id, array( 'inc_embed' => $inc_sub, 'inc_repeat' => $inc_sub ) );
 		if ( ! empty( $results ) ) {
-            $fields = array();
-            $count = 0;
-            foreach ( $results as $result ) {
-                if ( $type != $result->type ) {
-                    continue;
-                }
+			$fields = array();
+			$count = 0;
+			foreach ( $results as $result ) {
+				if ( $type != $result->type ) {
+					continue;
+				}
 
 				$fields[ $result->id ] = $result;
-                $count++;
-                if ( $limit == 1 ) {
-                    $fields = $result;
-                    break;
-                }
+				$count++;
+				if ( $limit == 1 ) {
+					$fields = $result;
+					break;
+				}
 
-                if ( ! empty($limit) && $count >= $limit ) {
-                    break;
-                }
+				if ( ! empty($limit) && $count >= $limit ) {
+					break;
+				}
 
-                unset($result);
-            }
-            return stripslashes_deep($fields);
-        }
+				unset($result);
+			}
+			return stripslashes_deep($fields);
+		}
 
-        self::$use_cache = false;
+		self::$use_cache = false;
 
 		$where = array( 'fi.form_id' => (int) $form_id, 'fi.type' => $type );
 		self::maybe_include_repeating_fields( $inc_sub, $where );
 		$results = self::getAll( $where, 'field_order', $limit );
-        self::$use_cache = true;
-        self::include_sub_fields($results, $inc_sub, $type);
+		self::$use_cache = true;
+		self::include_sub_fields($results, $inc_sub, $type);
 
-        return $results;
-    }
+		return $results;
+	}
 
 	public static function get_all_for_form( $form_id, $limit = '', $inc_embed = 'exclude', $inc_repeat = 'include' ) {
-        if ( ! (int) $form_id ) {
-            return array();
-        }
+		if ( ! (int) $form_id ) {
+			return array();
+		}
 
 		$results = self::get_fields_from_transients( $form_id, array( 'inc_embed' => $inc_embed, 'inc_repeat' => $inc_repeat ) );
 		if ( ! empty( $results ) ) {
-            if ( empty($limit) ) {
+			if ( empty($limit) ) {
 				return $results;
-            }
+			}
 
-            $fields = array();
-            $count = 0;
-            foreach ( $results as $result ) {
+			$fields = array();
+			$count = 0;
+			foreach ( $results as $result ) {
 				$fields[ $result->id ] = $result;
-                if ( ! empty($limit) && $count >= $limit ) {
-                    break;
-                }
-            }
+				if ( ! empty($limit) && $count >= $limit ) {
+					break;
+				}
+			}
 
 			return $fields;
-        }
+		}
 
-        self::$use_cache = false;
+		self::$use_cache = false;
 
 		$where = array( 'fi.form_id' => absint( $form_id ) );
 		self::maybe_include_repeating_fields( $inc_repeat, $where );
 		$results = self::getAll( $where, 'field_order', $limit );
 
-        self::$use_cache = true;
+		self::$use_cache = true;
 
 		self::include_sub_fields( $results, $inc_embed, 'all' );
 
-        if ( empty($limit) ) {
+		if ( empty($limit) ) {
 			self::set_field_transient( $results, $form_id, 0, array( 'inc_embed' => $inc_embed, 'inc_repeat' => $inc_repeat ) );
-        }
+		}
 
 		return $results;
-    }
+	}
 
 	/**
-	* If repeating fields should be included, adjust $where accordingly
-	*
-	* @param string $inc_repeat
-	* @param array $where - pass by reference
-	*/
+	 * If repeating fields should be included, adjust $where accordingly
+	 *
+	 * @param string $inc_repeat
+	 * @param array $where - pass by reference
+	 */
 	private static function maybe_include_repeating_fields( $inc_repeat, &$where ) {
 		if ( $inc_repeat == 'include' ) {
 			$form_id = $where['fi.form_id'];
@@ -397,77 +397,77 @@ 
 
 	public static function include_sub_fields( &$results, $inc_embed, $type = 'all' ) {
 		if ( 'include' != $inc_embed || empty( $results ) ) {
-            return;
-        }
+			return;
+		}
 
-        $form_fields = $results;
+		$form_fields = $results;
 		$index_offset = 1;
-        foreach ( $form_fields as $k => $field ) {
-            if ( 'form' != $field->type || ! isset($field->field_options['form_select']) ) {
-                continue;
-            }
-
-            if ( $type == 'all' ) {
-                $sub_fields = self::get_all_for_form( $field->field_options['form_select'] );
-            } else {
-                $sub_fields = self::get_all_types_in_form($field->form_id, $type);
-            }
-
-            if ( ! empty($sub_fields) ) {
+		foreach ( $form_fields as $k => $field ) {
+			if ( 'form' != $field->type || ! isset($field->field_options['form_select']) ) {
+				continue;
+			}
+
+			if ( $type == 'all' ) {
+				$sub_fields = self::get_all_for_form( $field->field_options['form_select'] );
+			} else {
+				$sub_fields = self::get_all_types_in_form($field->form_id, $type);
+			}
+
+			if ( ! empty($sub_fields) ) {
 				$index = $k + $index_offset;
 				$index_offset += count( $sub_fields );
 				array_splice($results, $index, 0, $sub_fields);
-            }
-            unset($field, $sub_fields);
-        }
-    }
+			}
+			unset($field, $sub_fields);
+		}
+	}
 
 	public static function getAll( $where = array(), $order_by = '', $limit = '', $blog_id = false ) {
 		$cache_key = maybe_serialize( $where ) . $order_by . 'l' . $limit . 'b' . $blog_id;
-        if ( self::$use_cache ) {
-            // make sure old cache doesn't get saved as a transient
-            $results = wp_cache_get($cache_key, 'frm_field');
-            if ( false !== $results ) {
-                return stripslashes_deep($results);
-            }
-        }
-
-        global $wpdb;
-
-        if ( $blog_id && is_multisite() ) {
-            global $wpmuBaseTablePrefix;
-            if ( $wpmuBaseTablePrefix ) {
+		if ( self::$use_cache ) {
+			// make sure old cache doesn't get saved as a transient
+			$results = wp_cache_get($cache_key, 'frm_field');
+			if ( false !== $results ) {
+				return stripslashes_deep($results);
+			}
+		}
+
+		global $wpdb;
+
+		if ( $blog_id && is_multisite() ) {
+			global $wpmuBaseTablePrefix;
+			if ( $wpmuBaseTablePrefix ) {
 				$prefix = $wpmuBaseTablePrefix . $blog_id . '_';
-            } else {
-                $prefix = $wpdb->get_blog_prefix( $blog_id );
-            }
+			} else {
+				$prefix = $wpdb->get_blog_prefix( $blog_id );
+			}
 
 			$table_name = $prefix . 'frm_fields';
 			$form_table_name = $prefix . 'frm_forms';
 		} else {
 			$table_name = $wpdb->prefix . 'frm_fields';
 			$form_table_name = $wpdb->prefix . 'frm_forms';
-        }
+		}
 
 		if ( ! empty( $order_by ) && strpos( $order_by, 'ORDER BY' ) === false ) {
 			$order_by = ' ORDER BY ' . $order_by;
 		}
 
-        $limit = FrmAppHelper::esc_limit($limit);
+		$limit = FrmAppHelper::esc_limit($limit);
 
-        $query = "SELECT fi.*, fr.name as form_name  FROM {$table_name} fi LEFT OUTER JOIN {$form_table_name} fr ON fi.form_id=fr.id";
-        $query_type = ( $limit == ' LIMIT 1' || $limit == 1 ) ? 'row' : 'results';
+		$query = "SELECT fi.*, fr.name as form_name  FROM {$table_name} fi LEFT OUTER JOIN {$form_table_name} fr ON fi.form_id=fr.id";
+		$query_type = ( $limit == ' LIMIT 1' || $limit == 1 ) ? 'row' : 'results';
 
-        if ( is_array($where) ) {
-            $results = FrmDb::get_var( $table_name . ' fi LEFT OUTER JOIN ' . $form_table_name . ' fr ON fi.form_id=fr.id', $where, 'fi.*, fr.name as form_name', array( 'order_by' => $order_by, 'limit' => $limit ), '', $query_type );
+		if ( is_array($where) ) {
+			$results = FrmDb::get_var( $table_name . ' fi LEFT OUTER JOIN ' . $form_table_name . ' fr ON fi.form_id=fr.id', $where, 'fi.*, fr.name as form_name', array( 'order_by' => $order_by, 'limit' => $limit ), '', $query_type );
 		} else {
 			// if the query is not an array, then it has already been prepared
-            $query .= FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+			$query .= FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
 
 			$function_name = ( $query_type == 'row' ) ? 'get_row' : 'get_results';
 			$results = $wpdb->$function_name( $query );
-        }
-        unset( $where );
+		}
+		unset( $where );
 
 		self::format_field_results( $results );
 
@@ -566,21 +566,21 @@ 
 
 	public static function getIds( $where = '', $order_by = '', $limit = '' ) {
 		_deprecated_function( __FUNCTION__, '2.0' );
-        global $wpdb;
-        if ( ! empty($order_by) && ! strpos($order_by, 'ORDER BY') !== false ) {
+		global $wpdb;
+		if ( ! empty($order_by) && ! strpos($order_by, 'ORDER BY') !== false ) {
 			$order_by = ' ORDER BY ' . $order_by;
-        }
+		}
 
 		$query = 'SELECT fi.id  FROM ' . $wpdb->prefix . 'frm_fields fi ' .
 			'LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fr ON fi.form_id=fr.id' .
 			FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
 
-        $method = ( $limit == ' LIMIT 1' || $limit == 1 ) ? 'get_var' : 'get_col';
+		$method = ( $limit == ' LIMIT 1' || $limit == 1 ) ? 'get_var' : 'get_col';
 		$cache_key = 'getIds_' . maybe_serialize( $where ) . $order_by . $limit;
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_field', $query, $method);
+		$results = FrmAppHelper::check_cache($cache_key, 'frm_field', $query, $method);
 
-        return $results;
-    }
+		return $results;
+	}
 
 	public static function is_no_save_field( $type ) {
 		return in_array( $type, self::no_save_fields() );
@@ -723,8 +723,8 @@ 
 	}
 
 	/**
-	* @since 2.0.09
-	*/
+	 * @since 2.0.09
+	 */
 	public static function is_repeating_field( $field ) {
 		if ( is_array( $field ) ) {
 			$is_repeating_field = ( 'divider' == $field['type'] );
@@ -734,14 +734,14 @@ 
 		return ( $is_repeating_field && self::is_option_true( $field, 'repeat' ) );
 	}
 
-    /**
-     * @param string $key
-     * @return int field id
-     */
+	/**
+	 * @param string $key
+	 * @return int field id
+	 */
 	public static function get_id_by_key( $key ) {
-        $id = FrmDb::get_var( 'frm_fields', array( 'field_key' => sanitize_title( $key ) ) );
-        return $id;
-    }
+		$id = FrmDb::get_var( 'frm_fields', array( 'field_key' => sanitize_title( $key ) ) );
+		return $id;
+	}
 
 	/**
 	 * @param string $id

Spacing +75 added lines, -75 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -8,7 +8,7 @@ 
 	static $transient_size = 200;
 
 	public static function field_selection() {
-		$fields = apply_filters('frm_available_fields', array(
+		$fields = apply_filters( 'frm_available_fields', array(
 			'text'      => __( 'Single Line Text', 'formidable' ),
 			'textarea'  => __( 'Paragraph Text', 'formidable' ),
 			'checkbox'  => __( 'Checkboxes', 'formidable' ),
@@ -17,13 +17,13 @@ 
 			'email'     => __( 'Email Address', 'formidable' ),
 			'url'       => __( 'Website/URL', 'formidable' ),
 			'captcha'   => __( 'reCAPTCHA', 'formidable' ),
-		));
+		) );
 
 		return $fields;
 	}
 
 	public static function pro_field_selection() {
-		return apply_filters('frm_pro_available_fields', array(
+		return apply_filters( 'frm_pro_available_fields', array(
 			'end_divider' => array(
 				'name'  => __( 'End Section', 'formidable' ),
 				'switch_from' => 'divider',
@@ -48,36 +48,36 @@ 
 			'tag'       => __( 'Tags', 'formidable' ),
 			'credit_card' => __( 'Credit Card', 'formidable' ),
 			'address'   => __( 'Address', 'formidable' ),
-		));
+		) );
 	}
 
     public static function create( $values, $return = true ) {
         global $wpdb, $frm_duplicate_ids;
 
         $new_values = array();
-        $key = isset($values['field_key']) ? $values['field_key'] : $values['name'];
+        $key = isset( $values['field_key'] ) ? $values['field_key'] : $values['name'];
 		$new_values['field_key'] = FrmAppHelper::get_unique_key( $key, $wpdb->prefix . 'frm_fields', 'field_key' );
 
 		foreach ( array( 'name', 'description', 'type', 'default_value' ) as $col ) {
-			$new_values[ $col ] = $values[ $col ];
+			$new_values[$col] = $values[$col];
         }
 
         $new_values['options'] = $values['options'];
 
-        $new_values['field_order'] = isset($values['field_order']) ? (int) $values['field_order'] : null;
-        $new_values['required'] = isset($values['required']) ? (int) $values['required'] : 0;
-        $new_values['form_id'] = isset($values['form_id']) ? (int) $values['form_id'] : null;
+        $new_values['field_order'] = isset( $values['field_order'] ) ? (int) $values['field_order'] : null;
+        $new_values['required'] = isset( $values['required'] ) ? (int) $values['required'] : 0;
+        $new_values['form_id'] = isset( $values['form_id'] ) ? (int) $values['form_id'] : null;
         $new_values['field_options'] = $values['field_options'];
-        $new_values['created_at'] = current_time('mysql', 1);
+        $new_values['created_at'] = current_time( 'mysql', 1 );
 
 		if ( isset( $values['id'] ) ) {
-			$frm_duplicate_ids[ $values['field_key'] ] = $new_values['field_key'];
-            $new_values = apply_filters('frm_duplicated_field', $new_values);
+			$frm_duplicate_ids[$values['field_key']] = $new_values['field_key'];
+            $new_values = apply_filters( 'frm_duplicated_field', $new_values );
         }
 
 		foreach ( $new_values as $k => $v ) {
             if ( is_array( $v ) ) {
-				$new_values[ $k ] = serialize( $v );
+				$new_values[$k] = serialize( $v );
 			}
             unset( $k, $v );
         }
@@ -98,7 +98,7 @@ 
 
 		if ( $query_results ) {
 			if ( isset( $values['id'] ) ) {
-				$frm_duplicate_ids[ $values['id'] ] = $new_id;
+				$frm_duplicate_ids[$values['id']] = $new_id;
 			}
 			return $new_id;
 		} else {
@@ -113,9 +113,9 @@ 
 		$fields = self::getAll( $where, 'field_order', '', $blog_id );
 
         foreach ( (array) $fields as $field ) {
-            $new_key = ($copy_keys) ? $field->field_key : '';
-            if ( $copy_keys && substr($field->field_key, -1) == 2 ) {
-                $new_key = rtrim($new_key, 2);
+            $new_key = ( $copy_keys ) ? $field->field_key : '';
+            if ( $copy_keys && substr( $field->field_key, -1 ) == 2 ) {
+                $new_key = rtrim( $new_key, 2 );
             }
 
             $values = array();
@@ -138,11 +138,11 @@ 
 				$values['form_id'] = $new_repeat_form_id;
 			}
 
-            $values = apply_filters('frm_duplicated_field', $values);
-            $new_id = self::create($values);
-            $frm_duplicate_ids[ $field->id ] = $new_id;
-            $frm_duplicate_ids[ $field->field_key ] = $new_id;
-            unset($field);
+            $values = apply_filters( 'frm_duplicated_field', $values );
+            $new_id = self::create( $values );
+            $frm_duplicate_ids[$field->id] = $new_id;
+            $frm_duplicate_ids[$field->field_key] = $new_id;
+            unset( $field );
         }
     }
 
@@ -155,7 +155,7 @@ 
 			$values['field_key'] = FrmAppHelper::get_unique_key( $values['field_key'], $wpdb->prefix . 'frm_fields', 'field_key', $id );
 		}
 
-        if ( isset($values['required']) ) {
+        if ( isset( $values['required'] ) ) {
             $values['required'] = (int) $values['required'];
         }
 
@@ -167,8 +167,8 @@ 
 
 		// serialize array values
 		foreach ( array( 'default_value', 'field_options', 'options' ) as $opt ) {
-			if ( isset( $values[ $opt ] ) && is_array( $values[ $opt ] ) ) {
-				$values[ $opt ] = serialize( $values[ $opt ] );
+			if ( isset( $values[$opt] ) && is_array( $values[$opt] ) ) {
+				$values[$opt] = serialize( $values[$opt] );
 			}
 		}
 
@@ -178,13 +178,13 @@ 
 		if ( isset( $values['form_id'] ) ) {
             $form_id = absint( $values['form_id'] );
 		} else {
-            $field = self::getOne($id);
+            $field = self::getOne( $id );
             if ( $field ) {
                 $form_id = $field->form_id;
             }
-            unset($field);
+            unset( $field );
         }
-        unset($values);
+        unset( $values );
 
 		if ( $query_results ) {
             wp_cache_delete( $id, 'frm_field' );
@@ -236,13 +236,13 @@ 
 		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->options . ' WHERE option_name LIKE %s OR option_name LIKE %s OR option_name LIKE %s OR option_name LIKE %s', '_transient_timeout_frm_form_fields_' . $form_id . 'ex%', '_transient_frm_form_fields_' . $form_id . 'ex%', '_transient_timeout_frm_form_fields_' . $form_id . 'in%', '_transient_frm_form_fields_' . $form_id . 'in%' ) );
 
 		$cache_key = serialize( array( 'fi.form_id' => $form_id ) ) . 'field_orderlb';
-        wp_cache_delete($cache_key, 'frm_field');
+        wp_cache_delete( $cache_key, 'frm_field' );
 
 		// this cache key is autogenerated in FrmDb::get_var
 		wp_cache_delete( '(__fi.form_id=%d_OR_fr.parent_form_id=%d_)__' . $form_id . '_' . $form_id . '_ORDER_BY_field_orderfi.*__fr.name_as_form_name_results', 'frm_field' );
 		wp_cache_delete( '1_' . $form_id . '_' . $form_id . '_ORDER_BY_field_orderfi.*__fr.name_as_form_name_results', 'frm_field' );
 
-        $form = FrmForm::getOne($form_id);
+        $form = FrmForm::getOne( $form_id );
         if ( $form && $form->parent_form_id ) {
             self::delete_form_transient( $form->parent_form_id );
         }
@@ -264,16 +264,16 @@ 
 
         global $wpdb;
 
-        $where = is_numeric($id) ? 'id=%d' : 'field_key=%s';
+        $where = is_numeric( $id ) ? 'id=%d' : 'field_key=%s';
 		$query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->prefix . 'frm_fields WHERE ' . $where, $id );
 
         $results = FrmAppHelper::check_cache( $id, 'frm_field', $query, 'get_row', 0 );
 
-        if ( empty($results) ) {
+        if ( empty( $results ) ) {
             return $results;
         }
 
-        if ( is_numeric($id) ) {
+        if ( is_numeric( $id ) ) {
             wp_cache_set( $results->field_key, $results, 'frm_field' );
         } else if ( $results ) {
             wp_cache_set( $results->id, $results, 'frm_field' );
@@ -281,7 +281,7 @@ 
 
 		self::prepare_options( $results );
 
-        return stripslashes_deep($results);
+        return stripslashes_deep( $results );
     }
 
     /**
@@ -314,20 +314,20 @@ 
                     continue;
                 }
 
-				$fields[ $result->id ] = $result;
-                $count++;
+				$fields[$result->id] = $result;
+                $count ++;
                 if ( $limit == 1 ) {
                     $fields = $result;
                     break;
                 }
 
-                if ( ! empty($limit) && $count >= $limit ) {
+                if ( ! empty( $limit ) && $count >= $limit ) {
                     break;
                 }
 
-                unset($result);
+                unset( $result );
             }
-            return stripslashes_deep($fields);
+            return stripslashes_deep( $fields );
         }
 
         self::$use_cache = false;
@@ -336,7 +336,7 @@ 
 		self::maybe_include_repeating_fields( $inc_sub, $where );
 		$results = self::getAll( $where, 'field_order', $limit );
         self::$use_cache = true;
-        self::include_sub_fields($results, $inc_sub, $type);
+        self::include_sub_fields( $results, $inc_sub, $type );
 
         return $results;
     }
@@ -348,15 +348,15 @@ 
 
 		$results = self::get_fields_from_transients( $form_id, array( 'inc_embed' => $inc_embed, 'inc_repeat' => $inc_repeat ) );
 		if ( ! empty( $results ) ) {
-            if ( empty($limit) ) {
+            if ( empty( $limit ) ) {
 				return $results;
             }
 
             $fields = array();
             $count = 0;
             foreach ( $results as $result ) {
-				$fields[ $result->id ] = $result;
-                if ( ! empty($limit) && $count >= $limit ) {
+				$fields[$result->id] = $result;
+                if ( ! empty( $limit ) && $count >= $limit ) {
                     break;
                 }
             }
@@ -374,7 +374,7 @@ 
 
 		self::include_sub_fields( $results, $inc_embed, 'all' );
 
-        if ( empty($limit) ) {
+        if ( empty( $limit ) ) {
 			self::set_field_transient( $results, $form_id, 0, array( 'inc_embed' => $inc_embed, 'inc_repeat' => $inc_repeat ) );
         }
 
@@ -403,22 +403,22 @@ 
         $form_fields = $results;
 		$index_offset = 1;
         foreach ( $form_fields as $k => $field ) {
-            if ( 'form' != $field->type || ! isset($field->field_options['form_select']) ) {
+            if ( 'form' != $field->type || ! isset( $field->field_options['form_select'] ) ) {
                 continue;
             }
 
             if ( $type == 'all' ) {
                 $sub_fields = self::get_all_for_form( $field->field_options['form_select'] );
             } else {
-                $sub_fields = self::get_all_types_in_form($field->form_id, $type);
+                $sub_fields = self::get_all_types_in_form( $field->form_id, $type );
             }
 
-            if ( ! empty($sub_fields) ) {
+            if ( ! empty( $sub_fields ) ) {
 				$index = $k + $index_offset;
 				$index_offset += count( $sub_fields );
-				array_splice($results, $index, 0, $sub_fields);
+				array_splice( $results, $index, 0, $sub_fields );
             }
-            unset($field, $sub_fields);
+            unset( $field, $sub_fields );
         }
     }
 
@@ -426,9 +426,9 @@ 
 		$cache_key = maybe_serialize( $where ) . $order_by . 'l' . $limit . 'b' . $blog_id;
         if ( self::$use_cache ) {
             // make sure old cache doesn't get saved as a transient
-            $results = wp_cache_get($cache_key, 'frm_field');
+            $results = wp_cache_get( $cache_key, 'frm_field' );
             if ( false !== $results ) {
-                return stripslashes_deep($results);
+                return stripslashes_deep( $results );
             }
         }
 
@@ -453,16 +453,16 @@ 
 			$order_by = ' ORDER BY ' . $order_by;
 		}
 
-        $limit = FrmAppHelper::esc_limit($limit);
+        $limit = FrmAppHelper::esc_limit( $limit );
 
         $query = "SELECT fi.*, fr.name as form_name  FROM {$table_name} fi LEFT OUTER JOIN {$form_table_name} fr ON fi.form_id=fr.id";
         $query_type = ( $limit == ' LIMIT 1' || $limit == 1 ) ? 'row' : 'results';
 
-        if ( is_array($where) ) {
+        if ( is_array( $where ) ) {
             $results = FrmDb::get_var( $table_name . ' fi LEFT OUTER JOIN ' . $form_table_name . ' fr ON fi.form_id=fr.id', $where, 'fi.*, fr.name as form_name', array( 'order_by' => $order_by, 'limit' => $limit ), '', $query_type );
 		} else {
 			// if the query is not an array, then it has already been prepared
-            $query .= FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+            $query .= FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
 
 			$function_name = ( $query_type == 'row' ) ? 'get_row' : 'get_results';
 			$results = $wpdb->$function_name( $query );
@@ -485,9 +485,9 @@ 
 				wp_cache_set( $result->id, $result, 'frm_field' );
 				wp_cache_set( $result->field_key, $result, 'frm_field' );
 
-				$results[ $r_key ]->field_options = maybe_unserialize( $result->field_options );
-				$results[ $r_key ]->options = maybe_unserialize( $result->options );
-				$results[ $r_key ]->default_value = maybe_unserialize( $result->default_value );
+				$results[$r_key]->field_options = maybe_unserialize( $result->field_options );
+				$results[$r_key]->options = maybe_unserialize( $result->options );
+				$results[$r_key]->default_value = maybe_unserialize( $result->default_value );
 
 				unset( $r_key, $result );
 			}
@@ -506,8 +506,8 @@ 
 	private static function prepare_options( &$results ) {
 		$results->field_options = maybe_unserialize( $results->field_options );
 
-		$results->options = maybe_unserialize($results->options);
-		$results->default_value = maybe_unserialize($results->default_value);
+		$results->options = maybe_unserialize( $results->options );
+		$results->default_value = maybe_unserialize( $results->default_value );
 	}
 
 	/**
@@ -534,7 +534,7 @@ 
 
 			if ( count( $next_fields ) >= self::$transient_size ) {
 				// if this transient is full, check for another
-				$next++;
+				$next ++;
 				self::get_next_transient( $fields, $base_name, $next );
 			}
 		}
@@ -560,14 +560,14 @@ 
 				return;
 			}
 
-			$next++;
+			$next ++;
 		}
 	}
 
 	public static function getIds( $where = '', $order_by = '', $limit = '' ) {
 		_deprecated_function( __FUNCTION__, '2.0' );
         global $wpdb;
-        if ( ! empty($order_by) && ! strpos($order_by, 'ORDER BY') !== false ) {
+        if ( ! empty( $order_by ) && ! strpos( $order_by, 'ORDER BY' ) !== false ) {
 			$order_by = ' ORDER BY ' . $order_by;
         }
 
@@ -577,7 +577,7 @@ 
 
         $method = ( $limit == ' LIMIT 1' || $limit == 1 ) ? 'get_var' : 'get_col';
 		$cache_key = 'getIds_' . maybe_serialize( $where ) . $order_by . $limit;
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_field', $query, $method);
+        $results = FrmAppHelper::check_cache( $cache_key, 'frm_field', $query, $method );
 
         return $results;
     }
@@ -608,8 +608,8 @@ 
 			$is_multi_value_field = (
 				$field['type'] == 'checkbox' ||
 				$field['type'] == 'address' ||
-				( $field['type'] == 'data' && isset($field['data_type']) && $field['data_type'] == 'checkbox' ) ||
-				( $field['type'] == 'lookup' && isset($field['data_type']) && $field['data_type'] == 'checkbox' ) ||
+				( $field['type'] == 'data' && isset( $field['data_type'] ) && $field['data_type'] == 'checkbox' ) ||
+				( $field['type'] == 'lookup' && isset( $field['data_type'] ) && $field['data_type'] == 'checkbox' ) ||
 				self::is_multiple_select( $field )
 			);
 
@@ -634,9 +634,9 @@ 
 	 */
 	public static function is_multiple_select( $field ) {
 		if ( is_array( $field ) ) {
-			return self::is_option_true( $field, 'multiple' ) && ( ( $field['type'] == 'select' || ( $field['type'] == 'data' && isset( $field['data_type'] ) && $field['data_type'] == 'select') ) );
+			return self::is_option_true( $field, 'multiple' ) && ( ( $field['type'] == 'select' || ( $field['type'] == 'data' && isset( $field['data_type'] ) && $field['data_type'] == 'select' ) ) );
 		} else {
-			return self::is_option_true( $field, 'multiple' ) && ( ( $field->type == 'select' || ( $field->type == 'data' && isset($field->field_options['data_type'] ) && $field->field_options['data_type'] == 'select') ) );
+			return self::is_option_true( $field, 'multiple' ) && ( ( $field->type == 'select' || ( $field->type == 'data' && isset( $field->field_options['data_type'] ) && $field->field_options['data_type'] == 'select' ) ) );
 		}
 	}
 
@@ -683,23 +683,23 @@ 
 	}
 
 	public static function is_option_true_in_array( $field, $option ) {
-		return isset( $field[ $option ] ) && $field[ $option ];
+		return isset( $field[$option] ) && $field[$option];
 	}
 
 	public static function is_option_true_in_object( $field, $option ) {
-		return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ];
+		return isset( $field->field_options[$option] ) && $field->field_options[$option];
 	}
 
 	public static function is_option_empty_in_array( $field, $option ) {
-		return ! isset( $field[ $option ] ) || empty( $field[ $option ] );
+		return ! isset( $field[$option] ) || empty( $field[$option] );
 	}
 
 	public static function is_option_empty_in_object( $field, $option ) {
-		return ! isset( $field->field_options[ $option ] ) || empty( $field->field_options[ $option ] );
+		return ! isset( $field->field_options[$option] ) || empty( $field->field_options[$option] );
 	}
 
 	public static function is_option_value_in_object( $field, $option ) {
-		return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ] != '';
+		return isset( $field->field_options[$option] ) && $field->field_options[$option] != '';
 	}
 
 	/**
@@ -715,11 +715,11 @@ 
 	}
 
 	public static function get_option_in_array( $field, $option ) {
-		return $field[ $option ];
+		return $field[$option];
 	}
 
 	public static function get_option_in_object( $field, $option ) {
-		return isset( $field->field_options[ $option ] ) ? $field->field_options[ $option ] : '';
+		return isset( $field->field_options[$option] ) ? $field->field_options[$option] : '';
 	}
 
 	/**

classes/models/FrmNotification.php

Indentation +256 added lines, -256 removed lines

@@ -2,160 +2,160 @@ 
 
 class FrmNotification {
 	public function __construct() {
-        if ( ! defined('ABSPATH') ) {
-            die('You are not allowed to call this page directly.');
-        }
-        add_action('frm_trigger_email_action', 'FrmNotification::trigger_email', 10, 3);
-    }
+		if ( ! defined('ABSPATH') ) {
+			die('You are not allowed to call this page directly.');
+		}
+		add_action('frm_trigger_email_action', 'FrmNotification::trigger_email', 10, 3);
+	}
 
 	public static function trigger_email( $action, $entry, $form ) {
-        $notification = $action->post_content;
-        $email_key = $action->ID;
-
-        // Set the subject
-        if ( empty($notification['email_subject']) ) {
-            $notification['email_subject'] = sprintf(__( '%1$s Form submitted on %2$s', 'formidable' ), $form->name, '[sitename]');
-        }
-
-        $plain_text = $notification['plain_text'] ? true : false;
-
-        //Filter these fields
-        $filter_fields = array(
-            'email_to', 'cc', 'bcc',
-            'reply_to', 'from',
-            'email_subject', 'email_message',
-        );
-
-        add_filter('frm_plain_text_email', ($plain_text ? '__return_true' : '__return_false'));
-
-        //Get all values in entry in order to get User ID field ID
-        $values = FrmEntryMeta::getAll( array( 'it.field_id !' => 0, 'it.item_id' => $entry->id ), ' ORDER BY fi.field_order' );
-        $user_id_field = $user_id_key = '';
-        foreach ( $values as $value ) {
-            if ( $value->field_type == 'user_id' ) {
-                $user_id_field = $value->field_id;
-                $user_id_key = $value->field_key;
-                break;
-            }
-            unset($value);
-        }
-
-        //Filter and prepare the email fields
-        foreach ( $filter_fields as $f ) {
-            //Don't allow empty From
+		$notification = $action->post_content;
+		$email_key = $action->ID;
+
+		// Set the subject
+		if ( empty($notification['email_subject']) ) {
+			$notification['email_subject'] = sprintf(__( '%1$s Form submitted on %2$s', 'formidable' ), $form->name, '[sitename]');
+		}
+
+		$plain_text = $notification['plain_text'] ? true : false;
+
+		//Filter these fields
+		$filter_fields = array(
+			'email_to', 'cc', 'bcc',
+			'reply_to', 'from',
+			'email_subject', 'email_message',
+		);
+
+		add_filter('frm_plain_text_email', ($plain_text ? '__return_true' : '__return_false'));
+
+		//Get all values in entry in order to get User ID field ID
+		$values = FrmEntryMeta::getAll( array( 'it.field_id !' => 0, 'it.item_id' => $entry->id ), ' ORDER BY fi.field_order' );
+		$user_id_field = $user_id_key = '';
+		foreach ( $values as $value ) {
+			if ( $value->field_type == 'user_id' ) {
+				$user_id_field = $value->field_id;
+				$user_id_key = $value->field_key;
+				break;
+			}
+			unset($value);
+		}
+
+		//Filter and prepare the email fields
+		foreach ( $filter_fields as $f ) {
+			//Don't allow empty From
 			if ( $f == 'from' && empty( $notification[ $f ] ) ) {
 				$notification[ $f ] = '[admin_email]';
 			} else if ( in_array( $f, array( 'email_to', 'cc', 'bcc', 'reply_to', 'from' ) ) ) {
 				//Remove brackets
-                //Add a space in case there isn't one
+				//Add a space in case there isn't one
 				$notification[ $f ] = str_replace( '<', ' ', $notification[ $f ] );
 				$notification[ $f ] = str_replace( array( '"', '>' ), '', $notification[ $f ] );
 
-                //Switch userID shortcode to email address
+				//Switch userID shortcode to email address
 				if ( strpos( $notification[ $f ], '[' . $user_id_field . ']' ) !== false || strpos( $notification[ $f ], '[' . $user_id_key . ']' ) !== false ) {
 					$user_data = get_userdata( $entry->metas[ $user_id_field ] );
-                    $user_email = $user_data->user_email;
+					$user_email = $user_data->user_email;
 					$notification[ $f ] = str_replace( array( '[' . $user_id_field . ']', '[' . $user_id_key . ']' ), $user_email, $notification[ $f ] );
-                }
-            }
+				}
+			}
 
 			$notification[ $f ] = FrmFieldsHelper::basic_replace_shortcodes( $notification[ $f ], $form, $entry );
-        }
+		}
 
-        //Put recipients, cc, and bcc into an array if they aren't empty
+		//Put recipients, cc, and bcc into an array if they aren't empty
 		$to_emails = self::explode_emails( $notification['email_to'] );
 		$cc = self::explode_emails( $notification['cc'] );
 		$bcc = self::explode_emails( $notification['bcc'] );
 
-        $to_emails = apply_filters('frm_to_email', $to_emails, $values, $form->id, compact('email_key', 'entry', 'form'));
+		$to_emails = apply_filters('frm_to_email', $to_emails, $values, $form->id, compact('email_key', 'entry', 'form'));
 
-        // Stop now if there aren't any recipients
-        if ( empty( $to_emails ) && empty( $cc ) && empty( $bcc ) ) {
-            return;
-        }
+		// Stop now if there aren't any recipients
+		if ( empty( $to_emails ) && empty( $cc ) && empty( $bcc ) ) {
+			return;
+		}
 
-        $to_emails = array_unique( (array) $to_emails );
+		$to_emails = array_unique( (array) $to_emails );
 
-        $prev_mail_body = $mail_body = $notification['email_message'];
-        $mail_body = FrmEntriesHelper::replace_default_message($mail_body, array(
-            'id' => $entry->id, 'entry' => $entry, 'plain_text' => $plain_text,
-            'user_info' => (isset($notification['inc_user_info']) ? $notification['inc_user_info'] : false),
-        ) );
+		$prev_mail_body = $mail_body = $notification['email_message'];
+		$mail_body = FrmEntriesHelper::replace_default_message($mail_body, array(
+			'id' => $entry->id, 'entry' => $entry, 'plain_text' => $plain_text,
+			'user_info' => (isset($notification['inc_user_info']) ? $notification['inc_user_info'] : false),
+		) );
 
-        // Add the user info if it isn't already included
-        if ( $notification['inc_user_info'] && $prev_mail_body == $mail_body ) {
-            $data = maybe_unserialize($entry->description);
+		// Add the user info if it isn't already included
+		if ( $notification['inc_user_info'] && $prev_mail_body == $mail_body ) {
+			$data = maybe_unserialize($entry->description);
 			$mail_body .= "\r\n\r\n" . __( 'User Information', 'formidable' ) . "\r\n";
 			$mail_body .= __( 'IP Address', 'formidable' ) . ': ' . $entry->ip . "\r\n";
 			$mail_body .= __( 'User-Agent (Browser/OS)', 'formidable' ) . ': ' . FrmEntryFormat::get_browser( $data['browser'] ) . "\r\n";
 			$mail_body .= __( 'Referrer', 'formidable' ) . ': ' . $data['referrer'] . "\r\n";
-        }
-        unset($prev_mail_body);
-
-        // Add attachments
-        $attachments = apply_filters('frm_notification_attachment', array(), $form, compact('entry', 'email_key') );
-
-        if ( ! empty($notification['email_subject']) ) {
-            $notification['email_subject'] = apply_filters('frm_email_subject', $notification['email_subject'], compact('form', 'entry', 'email_key'));
-        }
-
-        // check for a phone number
-        foreach ( (array) $to_emails as $email_key => $e ) {
-            if ( $e != '[admin_email]' && ! is_email($e) ) {
-                $e = explode(' ', $e);
-
-                //If to_email has name <test@mail.com> format
-                if ( is_email(end($e)) ) {
-                    continue;
-                }
-
-                do_action('frm_send_to_not_email', array(
-                    'e'         => $e,
-                    'subject'   => $notification['email_subject'],
-                    'mail_body' => $mail_body,
-                    'reply_to'  => $notification['reply_to'],
-                    'from'      => $notification['from'],
-                    'plain_text' => $plain_text,
-                    'attachments' => $attachments,
-                    'form'      => $form,
-                    'email_key' => $email_key,
-                ) );
+		}
+		unset($prev_mail_body);
+
+		// Add attachments
+		$attachments = apply_filters('frm_notification_attachment', array(), $form, compact('entry', 'email_key') );
+
+		if ( ! empty($notification['email_subject']) ) {
+			$notification['email_subject'] = apply_filters('frm_email_subject', $notification['email_subject'], compact('form', 'entry', 'email_key'));
+		}
+
+		// check for a phone number
+		foreach ( (array) $to_emails as $email_key => $e ) {
+			if ( $e != '[admin_email]' && ! is_email($e) ) {
+				$e = explode(' ', $e);
+
+				//If to_email has name <test@mail.com> format
+				if ( is_email(end($e)) ) {
+					continue;
+				}
+
+				do_action('frm_send_to_not_email', array(
+					'e'         => $e,
+					'subject'   => $notification['email_subject'],
+					'mail_body' => $mail_body,
+					'reply_to'  => $notification['reply_to'],
+					'from'      => $notification['from'],
+					'plain_text' => $plain_text,
+					'attachments' => $attachments,
+					'form'      => $form,
+					'email_key' => $email_key,
+				) );
 
 				unset( $to_emails[ $email_key ] );
-            }
-        }
-
-        // Send the email now
-        $sent_to = self::send_email( array(
-            'to_email'      => $to_emails,
-            'subject'       => $notification['email_subject'],
-            'message'       => $mail_body,
-            'from'          => $notification['from'],
-            'plain_text'    => $plain_text,
-            'reply_to'      => $notification['reply_to'],
-            'attachments'   => $attachments,
-            'cc'            => $cc,
-            'bcc'           => $bcc,
-        ) );
-
-        return $sent_to;
-    }
+			}
+		}
+
+		// Send the email now
+		$sent_to = self::send_email( array(
+			'to_email'      => $to_emails,
+			'subject'       => $notification['email_subject'],
+			'message'       => $mail_body,
+			'from'          => $notification['from'],
+			'plain_text'    => $plain_text,
+			'reply_to'      => $notification['reply_to'],
+			'attachments'   => $attachments,
+			'cc'            => $cc,
+			'bcc'           => $bcc,
+		) );
+
+		return $sent_to;
+	}
 
 	public function entry_created( $entry_id, $form_id ) {
 		$new_function = 'FrmFormActionsController::trigger_actions("create", ' . $form_id . ', ' . $entry_id . ', "email")';
 		_deprecated_function( __FUNCTION__, '2.0', $new_function );
-        FrmFormActionsController::trigger_actions('create', $form_id, $entry_id, 'email');
-    }
+		FrmFormActionsController::trigger_actions('create', $form_id, $entry_id, 'email');
+	}
 
 	public function send_notification_email( $to_email, $subject, $message, $from = '', $from_name = '', $plain_text = true, $attachments = array(), $reply_to = '' ) {
-        _deprecated_function( __FUNCTION__, '2.0', 'FrmNotification::send_email' );
+		_deprecated_function( __FUNCTION__, '2.0', 'FrmNotification::send_email' );
 
-        return self::send_email(compact(
-            'to_email', 'subject', 'message',
-            'from', 'from_name', 'plain_text',
-            'attachments', 'reply_to'
-        ));
-    }
+		return self::send_email(compact(
+			'to_email', 'subject', 'message',
+			'from', 'from_name', 'plain_text',
+			'attachments', 'reply_to'
+		));
+	}
 
 	/**
 	 * Extract the emails from cc and bcc. Allow separation by , or ;.
@@ -173,53 +173,53 @@ 
 		return $emails;
 	}
 
-    /**
-    * Put To, BCC, CC, Reply To, and From fields in Name <test@mail.com> format
-    * Formats that should work: Name, "Name", test@mail.com, <test@mail.com>, Name <test@mail.com>,
-    * "Name" <test@mail.com>, Name test@mail.com, "Name" test@mail.com, Name<test@mail.com>, "Name"<test@mail.com>
-    * "First Last" <test@mail.com>
-    *
-    * Things that won't work: First Last (with no email entered)
-    * @since 2.0
-    * @param array $atts array of email fields, pass by reference
-    * @param $admin_email
-    */
-    private static function format_email_fields( &$atts, $admin_email ) {
-
-        // If from is empty or is set to admin_email, set it now
-        $atts['from'] = ( empty($atts['from']) || $atts['from'] == '[admin_email]' ) ? $admin_email : $atts['from'];
-
-        // Filter values in these fields
+	/**
+	 * Put To, BCC, CC, Reply To, and From fields in Name <test@mail.com> format
+	 * Formats that should work: Name, "Name", test@mail.com, <test@mail.com>, Name <test@mail.com>,
+	 * "Name" <test@mail.com>, Name test@mail.com, "Name" test@mail.com, Name<test@mail.com>, "Name"<test@mail.com>
+	 * "First Last" <test@mail.com>
+	 *
+	 * Things that won't work: First Last (with no email entered)
+	 * @since 2.0
+	 * @param array $atts array of email fields, pass by reference
+	 * @param $admin_email
+	 */
+	private static function format_email_fields( &$atts, $admin_email ) {
+
+		// If from is empty or is set to admin_email, set it now
+		$atts['from'] = ( empty($atts['from']) || $atts['from'] == '[admin_email]' ) ? $admin_email : $atts['from'];
+
+		// Filter values in these fields
 		$filter_fields = array( 'to_email', 'bcc', 'cc', 'from', 'reply_to' );
 
-        foreach ( $filter_fields as $f ) {
-            // If empty, just skip it
+		foreach ( $filter_fields as $f ) {
+			// If empty, just skip it
 			if ( empty( $atts[ $f ] ) ) {
-                continue;
-            }
+				continue;
+			}
 
-            // to_email, cc, and bcc can be an array
+			// to_email, cc, and bcc can be an array
 			if ( is_array( $atts[ $f ] ) ) {
 				foreach ( $atts[ $f ] as $key => $val ) {
-                    self::format_single_field( $atts, $f, $val, $key );
-                    unset( $key, $val );
-                }
-                unset($f);
-                continue;
-            }
+					self::format_single_field( $atts, $f, $val, $key );
+					unset( $key, $val );
+				}
+				unset($f);
+				continue;
+			}
 
 			self::format_single_field( $atts, $f, $atts[ $f ] );
-        }
+		}
 
-        // If reply-to isn't set, make it match the from settings
-        if ( empty( $atts['reply_to'] ) ) {
-            $atts['reply_to'] = self::get_email_from_formatted_string( $atts['from'] );
-        }
+		// If reply-to isn't set, make it match the from settings
+		if ( empty( $atts['reply_to'] ) ) {
+			$atts['reply_to'] = self::get_email_from_formatted_string( $atts['from'] );
+		}
 
-        if ( ! is_array($atts['to_email']) && '[admin_email]' == $atts['to_email'] ) {
-            $atts['to_email'] = $admin_email;
-        }
-    }
+		if ( ! is_array($atts['to_email']) && '[admin_email]' == $atts['to_email'] ) {
+			$atts['to_email'] = $admin_email;
+		}
+	}
 
 	private static function get_email_from_formatted_string( $value ) {
 		if ( strpos( $value, '<' ) !== false ) {
@@ -229,48 +229,48 @@ 
 		return $value;
 	}
 
-    /**
-    * Format individual email fields
-    *
-    * @since 2.0
-    * @param array $atts pass by reference
-    * @param string $f (to, from, reply_to, etc)
-    * @param string $val value saved in field
-    * @param int $key if in array, this will be set
-    */
-    private static function format_single_field( &$atts, $f, $val, $key = false ) {
-        $val = trim($val);
-
-        // If just a plain email is used
-        if ( is_email($val) ) {
-            // add sender's name if not included in $from
-            if ( $f == 'from' ) {
+	/**
+	 * Format individual email fields
+	 *
+	 * @since 2.0
+	 * @param array $atts pass by reference
+	 * @param string $f (to, from, reply_to, etc)
+	 * @param string $val value saved in field
+	 * @param int $key if in array, this will be set
+	 */
+	private static function format_single_field( &$atts, $f, $val, $key = false ) {
+		$val = trim($val);
+
+		// If just a plain email is used
+		if ( is_email($val) ) {
+			// add sender's name if not included in $from
+			if ( $f == 'from' ) {
 				$part_2 = $atts[ $f ];
-                $part_1  = $atts['from_name'] ? $atts['from_name'] : wp_specialchars_decode( FrmAppHelper::site_name(), ENT_QUOTES );
-            } else {
-                return;
-            }
-        } else {
-            $parts = explode(' ', $val);
-            $part_2 = end($parts);
-
-            // If inputted correcly, $part_2 should be an email
-            if ( is_email( $part_2 ) ) {
-                $part_1 = trim( str_replace( $part_2, '', $val ) );
-            } else if ( in_array( $f, array( 'from', 'reply_to' ) ) ) {
+				$part_1  = $atts['from_name'] ? $atts['from_name'] : wp_specialchars_decode( FrmAppHelper::site_name(), ENT_QUOTES );
+			} else {
+				return;
+			}
+		} else {
+			$parts = explode(' ', $val);
+			$part_2 = end($parts);
+
+			// If inputted correcly, $part_2 should be an email
+			if ( is_email( $part_2 ) ) {
+				$part_1 = trim( str_replace( $part_2, '', $val ) );
+			} else if ( in_array( $f, array( 'from', 'reply_to' ) ) ) {
 				// In case someone just puts a name in the From or Reply To field
 				$part_1 = $val;
-                $part_2 = get_option('admin_email');
-            } else {
+				$part_2 = get_option('admin_email');
+			} else {
 				// In case someone just puts a name in any other email field
-                if ( false !== $key ) {
+				if ( false !== $key ) {
 					unset( $atts[ $f ][ $key ] );
-                    return;
-                }
+					return;
+				}
 				$atts[ $f ] = '';
-                return;
-            }
-        }
+				return;
+			}
+		}
 
 		// if sending the email from a yahoo address, change it to the WordPress default
 		if ( $f == 'from' && strpos( $part_2, '@yahoo.com' ) ) {
@@ -283,110 +283,110 @@ 
 			$part_2 = 'wordpress@' . $sitename;
 		}
 
-        // Set up formatted value
+		// Set up formatted value
 		$final_val = str_replace( '"', '', $part_1 ) . ' <' . $part_2 . '>';
 
-        // If value is an array
-        if ( false !== $key ) {
+		// If value is an array
+		if ( false !== $key ) {
 			$atts[ $f ][ $key ] = $final_val;
-            return;
-        }
+			return;
+		}
 		$atts[ $f ] = $final_val;
-    }
+	}
 
 	public static function send_email( $atts ) {
-        $admin_email = get_option('admin_email');
-        $defaults = array(
-            'to_email'      => $admin_email,
-            'subject'       => '',
-            'message'       => '',
-            'from'          => $admin_email,
-            'from_name'     => '',
-            'cc'            => '',
-            'bcc'           => '',
-            'plain_text'    => true,
-            'reply_to'      => $admin_email,
-            'attachments'   => array(),
-        );
-        $atts = wp_parse_args($atts, $defaults);
-
-        // Put To, BCC, CC, Reply To, and From fields in the correct format
-        self::format_email_fields( $atts, $admin_email );
-
-        $recipient      = $atts['to_email']; //recipient
-        $header         = array();
-        $header[]       = 'From: ' . $atts['from'];
-
-        //Allow for cc and bcc arrays
+		$admin_email = get_option('admin_email');
+		$defaults = array(
+			'to_email'      => $admin_email,
+			'subject'       => '',
+			'message'       => '',
+			'from'          => $admin_email,
+			'from_name'     => '',
+			'cc'            => '',
+			'bcc'           => '',
+			'plain_text'    => true,
+			'reply_to'      => $admin_email,
+			'attachments'   => array(),
+		);
+		$atts = wp_parse_args($atts, $defaults);
+
+		// Put To, BCC, CC, Reply To, and From fields in the correct format
+		self::format_email_fields( $atts, $admin_email );
+
+		$recipient      = $atts['to_email']; //recipient
+		$header         = array();
+		$header[]       = 'From: ' . $atts['from'];
+
+		//Allow for cc and bcc arrays
 		$array_fields = array( 'CC' => $atts['cc'], 'BCC' => $atts['bcc'] );
 		$cc = array( 'CC' => array(), 'BCC' => array() );
-        foreach ( $array_fields as $key => $a_field ) {
-            if ( empty($a_field) ) {
-                continue;
-            }
+		foreach ( $array_fields as $key => $a_field ) {
+			if ( empty($a_field) ) {
+				continue;
+			}
 
 			foreach ( (array) $a_field as $email ) {
 				$cc[ $key ][] = $email;
-            }
-            unset($key, $a_field);
-        }
+			}
+			unset($key, $a_field);
+		}
 		$cc = array_filter( $cc ); // remove cc and bcc if they are empty
 
 		foreach ( $cc as $k => $v ) {
 			$header[] = $k . ': ' . implode( ',', $v );
 		}
 
-        $content_type   = $atts['plain_text'] ? 'text/plain' : 'text/html';
-        $charset        = get_option('blog_charset');
+		$content_type   = $atts['plain_text'] ? 'text/plain' : 'text/html';
+		$charset        = get_option('blog_charset');
 
 		$header[]       = 'Reply-To: ' . $atts['reply_to'];
 		$header[]       = 'Content-Type: ' . $content_type . '; charset="' . esc_attr( $charset ) . '"';
-        $atts['subject'] = wp_specialchars_decode(strip_tags(stripslashes($atts['subject'])), ENT_QUOTES );
+		$atts['subject'] = wp_specialchars_decode(strip_tags(stripslashes($atts['subject'])), ENT_QUOTES );
 
-        $message        = do_shortcode($atts['message']);
+		$message        = do_shortcode($atts['message']);
 
-        if ( $atts['plain_text'] ) {
-            //$message    = wordwrap($message, 70, "\r\n"); //in case any lines are longer than 70 chars
-            $message    = wp_specialchars_decode(strip_tags($message), ENT_QUOTES );
-        } else {
+		if ( $atts['plain_text'] ) {
+			//$message    = wordwrap($message, 70, "\r\n"); //in case any lines are longer than 70 chars
+			$message    = wp_specialchars_decode(strip_tags($message), ENT_QUOTES );
+		} else {
 			// remove line breaks in HTML emails to prevent conflicts with Mandrill
-        	add_filter( 'mandrill_nl2br', 'FrmNotification::remove_mandrill_br' );
-        }
+			add_filter( 'mandrill_nl2br', 'FrmNotification::remove_mandrill_br' );
+		}
 		$message = apply_filters( 'frm_email_message', $message, $atts );
 
-        $header         = apply_filters('frm_email_header', $header, array(
+		$header         = apply_filters('frm_email_header', $header, array(
 			'to_email' => $atts['to_email'], 'subject' => $atts['subject'],
 		) );
 
-        if ( apply_filters('frm_encode_subject', 1, $atts['subject'] ) ) {
+		if ( apply_filters('frm_encode_subject', 1, $atts['subject'] ) ) {
 			$atts['subject'] = '=?' . $charset . '?B?' . base64_encode( $atts['subject'] ) . '?=';
-        }
+		}
 
-        remove_filter('wp_mail_from', 'bp_core_email_from_address_filter' );
-        remove_filter('wp_mail_from_name', 'bp_core_email_from_name_filter');
+		remove_filter('wp_mail_from', 'bp_core_email_from_address_filter' );
+		remove_filter('wp_mail_from_name', 'bp_core_email_from_name_filter');
 
-        $sent = wp_mail($recipient, $atts['subject'], $message, $header, $atts['attachments']);
-        if ( ! $sent ) {
+		$sent = wp_mail($recipient, $atts['subject'], $message, $header, $atts['attachments']);
+		if ( ! $sent ) {
 			$header = 'From: ' . $atts['from'] . "\r\n";
-            $recipient = implode(',', (array) $recipient);
-            $sent = mail($recipient, $atts['subject'], $message, $header);
-        }
+			$recipient = implode(',', (array) $recipient);
+			$sent = mail($recipient, $atts['subject'], $message, $header);
+		}
 
 		// remove the filter now so other emails can still use it
 		remove_filter( 'mandrill_nl2br', 'FrmNotification::remove_mandrill_br' );
 
-        do_action('frm_notification', $recipient, $atts['subject'], $message);
+		do_action('frm_notification', $recipient, $atts['subject'], $message);
 
-        if ( $sent ) {
+		if ( $sent ) {
 			$sent_to = array_merge( (array) $atts['to_email'], (array) $atts['cc'], (array) $atts['bcc'] );
-            $sent_to = array_filter( $sent_to );
-            if ( apply_filters('frm_echo_emails', false) ) {
-                $temp = str_replace('<', '&lt;', $sent_to);
+			$sent_to = array_filter( $sent_to );
+			if ( apply_filters('frm_echo_emails', false) ) {
+				$temp = str_replace('<', '&lt;', $sent_to);
 				echo ' ' . FrmAppHelper::kses( implode(', ', (array) $temp ) );
-            }
-            return $sent_to;
-        }
-    }
+			}
+			return $sent_to;
+		}
+	}
 
 	/**
 	 * This function should only be fired when Mandrill is sending an HTML email

Spacing +69 added lines, -69 removed lines

@@ -2,10 +2,10 @@ 
 
 class FrmNotification {
 	public function __construct() {
-        if ( ! defined('ABSPATH') ) {
-            die('You are not allowed to call this page directly.');
+        if ( ! defined( 'ABSPATH' ) ) {
+            die( 'You are not allowed to call this page directly.' );
         }
-        add_action('frm_trigger_email_action', 'FrmNotification::trigger_email', 10, 3);
+        add_action( 'frm_trigger_email_action', 'FrmNotification::trigger_email', 10, 3 );
     }
 
 	public static function trigger_email( $action, $entry, $form ) {
@@ -13,8 +13,8 @@ 
         $email_key = $action->ID;
 
         // Set the subject
-        if ( empty($notification['email_subject']) ) {
-            $notification['email_subject'] = sprintf(__( '%1$s Form submitted on %2$s', 'formidable' ), $form->name, '[sitename]');
+        if ( empty( $notification['email_subject'] ) ) {
+            $notification['email_subject'] = sprintf( __( '%1$s Form submitted on %2$s', 'formidable' ), $form->name, '[sitename]' );
         }
 
         $plain_text = $notification['plain_text'] ? true : false;
@@ -26,7 +26,7 @@ 
             'email_subject', 'email_message',
         );
 
-        add_filter('frm_plain_text_email', ($plain_text ? '__return_true' : '__return_false'));
+        add_filter( 'frm_plain_text_email', ( $plain_text ? '__return_true' : '__return_false' ) );
 
         //Get all values in entry in order to get User ID field ID
         $values = FrmEntryMeta::getAll( array( 'it.field_id !' => 0, 'it.item_id' => $entry->id ), ' ORDER BY fi.field_order' );
@@ -37,29 +37,29 @@ 
                 $user_id_key = $value->field_key;
                 break;
             }
-            unset($value);
+            unset( $value );
         }
 
         //Filter and prepare the email fields
         foreach ( $filter_fields as $f ) {
             //Don't allow empty From
-			if ( $f == 'from' && empty( $notification[ $f ] ) ) {
-				$notification[ $f ] = '[admin_email]';
+			if ( $f == 'from' && empty( $notification[$f] ) ) {
+				$notification[$f] = '[admin_email]';
 			} else if ( in_array( $f, array( 'email_to', 'cc', 'bcc', 'reply_to', 'from' ) ) ) {
 				//Remove brackets
                 //Add a space in case there isn't one
-				$notification[ $f ] = str_replace( '<', ' ', $notification[ $f ] );
-				$notification[ $f ] = str_replace( array( '"', '>' ), '', $notification[ $f ] );
+				$notification[$f] = str_replace( '<', ' ', $notification[$f] );
+				$notification[$f] = str_replace( array( '"', '>' ), '', $notification[$f] );
 
                 //Switch userID shortcode to email address
-				if ( strpos( $notification[ $f ], '[' . $user_id_field . ']' ) !== false || strpos( $notification[ $f ], '[' . $user_id_key . ']' ) !== false ) {
-					$user_data = get_userdata( $entry->metas[ $user_id_field ] );
+				if ( strpos( $notification[$f], '[' . $user_id_field . ']' ) !== false || strpos( $notification[$f], '[' . $user_id_key . ']' ) !== false ) {
+					$user_data = get_userdata( $entry->metas[$user_id_field] );
                     $user_email = $user_data->user_email;
-					$notification[ $f ] = str_replace( array( '[' . $user_id_field . ']', '[' . $user_id_key . ']' ), $user_email, $notification[ $f ] );
+					$notification[$f] = str_replace( array( '[' . $user_id_field . ']', '[' . $user_id_key . ']' ), $user_email, $notification[$f] );
                 }
             }
 
-			$notification[ $f ] = FrmFieldsHelper::basic_replace_shortcodes( $notification[ $f ], $form, $entry );
+			$notification[$f] = FrmFieldsHelper::basic_replace_shortcodes( $notification[$f], $form, $entry );
         }
 
         //Put recipients, cc, and bcc into an array if they aren't empty
@@ -67,7 +67,7 @@ 
 		$cc = self::explode_emails( $notification['cc'] );
 		$bcc = self::explode_emails( $notification['bcc'] );
 
-        $to_emails = apply_filters('frm_to_email', $to_emails, $values, $form->id, compact('email_key', 'entry', 'form'));
+        $to_emails = apply_filters( 'frm_to_email', $to_emails, $values, $form->id, compact( 'email_key', 'entry', 'form' ) );
 
         // Stop now if there aren't any recipients
         if ( empty( $to_emails ) && empty( $cc ) && empty( $bcc ) ) {
@@ -77,39 +77,39 @@ 
         $to_emails = array_unique( (array) $to_emails );
 
         $prev_mail_body = $mail_body = $notification['email_message'];
-        $mail_body = FrmEntriesHelper::replace_default_message($mail_body, array(
+        $mail_body = FrmEntriesHelper::replace_default_message( $mail_body, array(
             'id' => $entry->id, 'entry' => $entry, 'plain_text' => $plain_text,
-            'user_info' => (isset($notification['inc_user_info']) ? $notification['inc_user_info'] : false),
+            'user_info' => ( isset( $notification['inc_user_info'] ) ? $notification['inc_user_info'] : false ),
         ) );
 
         // Add the user info if it isn't already included
         if ( $notification['inc_user_info'] && $prev_mail_body == $mail_body ) {
-            $data = maybe_unserialize($entry->description);
+            $data = maybe_unserialize( $entry->description );
 			$mail_body .= "\r\n\r\n" . __( 'User Information', 'formidable' ) . "\r\n";
 			$mail_body .= __( 'IP Address', 'formidable' ) . ': ' . $entry->ip . "\r\n";
 			$mail_body .= __( 'User-Agent (Browser/OS)', 'formidable' ) . ': ' . FrmEntryFormat::get_browser( $data['browser'] ) . "\r\n";
 			$mail_body .= __( 'Referrer', 'formidable' ) . ': ' . $data['referrer'] . "\r\n";
         }
-        unset($prev_mail_body);
+        unset( $prev_mail_body );
 
         // Add attachments
-        $attachments = apply_filters('frm_notification_attachment', array(), $form, compact('entry', 'email_key') );
+        $attachments = apply_filters( 'frm_notification_attachment', array(), $form, compact( 'entry', 'email_key' ) );
 
-        if ( ! empty($notification['email_subject']) ) {
-            $notification['email_subject'] = apply_filters('frm_email_subject', $notification['email_subject'], compact('form', 'entry', 'email_key'));
+        if ( ! empty( $notification['email_subject'] ) ) {
+            $notification['email_subject'] = apply_filters( 'frm_email_subject', $notification['email_subject'], compact( 'form', 'entry', 'email_key' ) );
         }
 
         // check for a phone number
         foreach ( (array) $to_emails as $email_key => $e ) {
-            if ( $e != '[admin_email]' && ! is_email($e) ) {
-                $e = explode(' ', $e);
+            if ( $e != '[admin_email]' && ! is_email( $e ) ) {
+                $e = explode( ' ', $e );
 
                 //If to_email has name <test@mail.com> format
-                if ( is_email(end($e)) ) {
+                if ( is_email( end( $e ) ) ) {
                     continue;
                 }
 
-                do_action('frm_send_to_not_email', array(
+                do_action( 'frm_send_to_not_email', array(
                     'e'         => $e,
                     'subject'   => $notification['email_subject'],
                     'mail_body' => $mail_body,
@@ -121,7 +121,7 @@ 
                     'email_key' => $email_key,
                 ) );
 
-				unset( $to_emails[ $email_key ] );
+				unset( $to_emails[$email_key] );
             }
         }
 
@@ -144,17 +144,17 @@ 
 	public function entry_created( $entry_id, $form_id ) {
 		$new_function = 'FrmFormActionsController::trigger_actions("create", ' . $form_id . ', ' . $entry_id . ', "email")';
 		_deprecated_function( __FUNCTION__, '2.0', $new_function );
-        FrmFormActionsController::trigger_actions('create', $form_id, $entry_id, 'email');
+        FrmFormActionsController::trigger_actions( 'create', $form_id, $entry_id, 'email' );
     }
 
 	public function send_notification_email( $to_email, $subject, $message, $from = '', $from_name = '', $plain_text = true, $attachments = array(), $reply_to = '' ) {
         _deprecated_function( __FUNCTION__, '2.0', 'FrmNotification::send_email' );
 
-        return self::send_email(compact(
+        return self::send_email( compact(
             'to_email', 'subject', 'message',
             'from', 'from_name', 'plain_text',
             'attachments', 'reply_to'
-        ));
+        ) );
     }
 
 	/**
@@ -187,28 +187,28 @@ 
     private static function format_email_fields( &$atts, $admin_email ) {
 
         // If from is empty or is set to admin_email, set it now
-        $atts['from'] = ( empty($atts['from']) || $atts['from'] == '[admin_email]' ) ? $admin_email : $atts['from'];
+        $atts['from'] = ( empty( $atts['from'] ) || $atts['from'] == '[admin_email]' ) ? $admin_email : $atts['from'];
 
         // Filter values in these fields
 		$filter_fields = array( 'to_email', 'bcc', 'cc', 'from', 'reply_to' );
 
         foreach ( $filter_fields as $f ) {
             // If empty, just skip it
-			if ( empty( $atts[ $f ] ) ) {
+			if ( empty( $atts[$f] ) ) {
                 continue;
             }
 
             // to_email, cc, and bcc can be an array
-			if ( is_array( $atts[ $f ] ) ) {
-				foreach ( $atts[ $f ] as $key => $val ) {
+			if ( is_array( $atts[$f] ) ) {
+				foreach ( $atts[$f] as $key => $val ) {
                     self::format_single_field( $atts, $f, $val, $key );
                     unset( $key, $val );
                 }
-                unset($f);
+                unset( $f );
                 continue;
             }
 
-			self::format_single_field( $atts, $f, $atts[ $f ] );
+			self::format_single_field( $atts, $f, $atts[$f] );
         }
 
         // If reply-to isn't set, make it match the from settings
@@ -216,7 +216,7 @@ 
             $atts['reply_to'] = self::get_email_from_formatted_string( $atts['from'] );
         }
 
-        if ( ! is_array($atts['to_email']) && '[admin_email]' == $atts['to_email'] ) {
+        if ( ! is_array( $atts['to_email'] ) && '[admin_email]' == $atts['to_email'] ) {
             $atts['to_email'] = $admin_email;
         }
     }
@@ -239,20 +239,20 @@ 
     * @param int $key if in array, this will be set
     */
     private static function format_single_field( &$atts, $f, $val, $key = false ) {
-        $val = trim($val);
+        $val = trim( $val );
 
         // If just a plain email is used
-        if ( is_email($val) ) {
+        if ( is_email( $val ) ) {
             // add sender's name if not included in $from
             if ( $f == 'from' ) {
-				$part_2 = $atts[ $f ];
-                $part_1  = $atts['from_name'] ? $atts['from_name'] : wp_specialchars_decode( FrmAppHelper::site_name(), ENT_QUOTES );
+				$part_2 = $atts[$f];
+                $part_1 = $atts['from_name'] ? $atts['from_name'] : wp_specialchars_decode( FrmAppHelper::site_name(), ENT_QUOTES );
             } else {
                 return;
             }
         } else {
-            $parts = explode(' ', $val);
-            $part_2 = end($parts);
+            $parts = explode( ' ', $val );
+            $part_2 = end( $parts );
 
             // If inputted correcly, $part_2 should be an email
             if ( is_email( $part_2 ) ) {
@@ -260,14 +260,14 @@ 
             } else if ( in_array( $f, array( 'from', 'reply_to' ) ) ) {
 				// In case someone just puts a name in the From or Reply To field
 				$part_1 = $val;
-                $part_2 = get_option('admin_email');
+                $part_2 = get_option( 'admin_email' );
             } else {
 				// In case someone just puts a name in any other email field
                 if ( false !== $key ) {
-					unset( $atts[ $f ][ $key ] );
+					unset( $atts[$f][$key] );
                     return;
                 }
-				$atts[ $f ] = '';
+				$atts[$f] = '';
                 return;
             }
         }
@@ -288,14 +288,14 @@ 
 
         // If value is an array
         if ( false !== $key ) {
-			$atts[ $f ][ $key ] = $final_val;
+			$atts[$f][$key] = $final_val;
             return;
         }
-		$atts[ $f ] = $final_val;
+		$atts[$f] = $final_val;
     }
 
 	public static function send_email( $atts ) {
-        $admin_email = get_option('admin_email');
+        $admin_email = get_option( 'admin_email' );
         $defaults = array(
             'to_email'      => $admin_email,
             'subject'       => '',
@@ -308,7 +308,7 @@ 
             'reply_to'      => $admin_email,
             'attachments'   => array(),
         );
-        $atts = wp_parse_args($atts, $defaults);
+        $atts = wp_parse_args( $atts, $defaults );
 
         // Put To, BCC, CC, Reply To, and From fields in the correct format
         self::format_email_fields( $atts, $admin_email );
@@ -321,14 +321,14 @@ 
 		$array_fields = array( 'CC' => $atts['cc'], 'BCC' => $atts['bcc'] );
 		$cc = array( 'CC' => array(), 'BCC' => array() );
         foreach ( $array_fields as $key => $a_field ) {
-            if ( empty($a_field) ) {
+            if ( empty( $a_field ) ) {
                 continue;
             }
 
 			foreach ( (array) $a_field as $email ) {
-				$cc[ $key ][] = $email;
+				$cc[$key][] = $email;
             }
-            unset($key, $a_field);
+            unset( $key, $a_field );
         }
 		$cc = array_filter( $cc ); // remove cc and bcc if they are empty
 
@@ -337,52 +337,52 @@ 
 		}
 
         $content_type   = $atts['plain_text'] ? 'text/plain' : 'text/html';
-        $charset        = get_option('blog_charset');
+        $charset        = get_option( 'blog_charset' );
 
 		$header[]       = 'Reply-To: ' . $atts['reply_to'];
 		$header[]       = 'Content-Type: ' . $content_type . '; charset="' . esc_attr( $charset ) . '"';
-        $atts['subject'] = wp_specialchars_decode(strip_tags(stripslashes($atts['subject'])), ENT_QUOTES );
+        $atts['subject'] = wp_specialchars_decode( strip_tags( stripslashes( $atts['subject'] ) ), ENT_QUOTES );
 
-        $message        = do_shortcode($atts['message']);
+        $message = do_shortcode( $atts['message'] );
 
         if ( $atts['plain_text'] ) {
             //$message    = wordwrap($message, 70, "\r\n"); //in case any lines are longer than 70 chars
-            $message    = wp_specialchars_decode(strip_tags($message), ENT_QUOTES );
+            $message = wp_specialchars_decode( strip_tags( $message ), ENT_QUOTES );
         } else {
 			// remove line breaks in HTML emails to prevent conflicts with Mandrill
         	add_filter( 'mandrill_nl2br', 'FrmNotification::remove_mandrill_br' );
         }
 		$message = apply_filters( 'frm_email_message', $message, $atts );
 
-        $header         = apply_filters('frm_email_header', $header, array(
+        $header = apply_filters( 'frm_email_header', $header, array(
 			'to_email' => $atts['to_email'], 'subject' => $atts['subject'],
 		) );
 
-        if ( apply_filters('frm_encode_subject', 1, $atts['subject'] ) ) {
+        if ( apply_filters( 'frm_encode_subject', 1, $atts['subject'] ) ) {
 			$atts['subject'] = '=?' . $charset . '?B?' . base64_encode( $atts['subject'] ) . '?=';
         }
 
-        remove_filter('wp_mail_from', 'bp_core_email_from_address_filter' );
-        remove_filter('wp_mail_from_name', 'bp_core_email_from_name_filter');
+        remove_filter( 'wp_mail_from', 'bp_core_email_from_address_filter' );
+        remove_filter( 'wp_mail_from_name', 'bp_core_email_from_name_filter' );
 
-        $sent = wp_mail($recipient, $atts['subject'], $message, $header, $atts['attachments']);
+        $sent = wp_mail( $recipient, $atts['subject'], $message, $header, $atts['attachments'] );
         if ( ! $sent ) {
 			$header = 'From: ' . $atts['from'] . "\r\n";
-            $recipient = implode(',', (array) $recipient);
-            $sent = mail($recipient, $atts['subject'], $message, $header);
+            $recipient = implode( ',', (array) $recipient );
+            $sent = mail( $recipient, $atts['subject'], $message, $header );
         }
 
 		// remove the filter now so other emails can still use it
 		remove_filter( 'mandrill_nl2br', 'FrmNotification::remove_mandrill_br' );
 
-        do_action('frm_notification', $recipient, $atts['subject'], $message);
+        do_action( 'frm_notification', $recipient, $atts['subject'], $message );
 
         if ( $sent ) {
 			$sent_to = array_merge( (array) $atts['to_email'], (array) $atts['cc'], (array) $atts['bcc'] );
             $sent_to = array_filter( $sent_to );
-            if ( apply_filters('frm_echo_emails', false) ) {
-                $temp = str_replace('<', '&lt;', $sent_to);
-				echo ' ' . FrmAppHelper::kses( implode(', ', (array) $temp ) );
+            if ( apply_filters( 'frm_echo_emails', false ) ) {
+                $temp = str_replace( '<', '&lt;', $sent_to );
+				echo ' ' . FrmAppHelper::kses( implode( ', ', (array) $temp ) );
             }
             return $sent_to;
         }