Strategy11 / formidable-forms

classes/controllers/FrmAddonsController.php

Spacing +8 added lines, -8 removed lines

@@ -42,7 +42,7 @@ 
 
 		$keyed_addons = array();
 		foreach ( $addons as $addon ) {
-			$keyed_addons[ $addon['info']['slug'] ] = $addon;
+			$keyed_addons[$addon['info']['slug']] = $addon;
 		}
 
 		$plugin_order = array(
@@ -53,9 +53,9 @@ 
 		);
 		$ordered_addons = array();
 		foreach ( $plugin_order as $plugin ) {
-			if ( isset( $keyed_addons[ $plugin ] ) ) {
-				$ordered_addons[] = $keyed_addons[ $plugin ];
-				unset( $keyed_addons[ $plugin ] );
+			if ( isset( $keyed_addons[$plugin] ) ) {
+				$ordered_addons[] = $keyed_addons[$plugin];
+				unset( $keyed_addons[$plugin] );
 			}
 		}
 		$addons = $ordered_addons + $keyed_addons;
@@ -90,10 +90,10 @@ 
 	}
 
 	public static function get_licenses() {
-		FrmAppHelper::permission_check('frm_change_settings');
+		FrmAppHelper::permission_check( 'frm_change_settings' );
 		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-		$license = get_option('frmpro-credentials');
+		$license = get_option( 'frmpro-credentials' );
 		if ( $license && is_array( $license ) && isset( $license['license'] ) ) {
 			$url = 'http://formidablepro.com/frm-edd-api/licenses?l=' . urlencode( base64_encode( $license['license'] ) );
 			$licenses = self::send_api_request( $url, array( 'name' => 'frm_api_licence', 'expires' => 60 * 60 * 5 ) );
@@ -146,8 +146,8 @@ 
 		);
 
 		foreach ( $pro['pricing'] as $name => $price ) {
-			if ( isset( $pro_pricing[ $name ] ) ) {
-				$pro_pricing[ $name ]['price'] = $price;
+			if ( isset( $pro_pricing[$name] ) ) {
+				$pro_pricing[$name]['price'] = $price;
 			}
 		}
 	}

classes/models/FrmSettings.php

Indentation +182 added lines, -182 removed lines

@@ -1,243 +1,243 @@
 <?php
 
 class FrmSettings{
-    public $option_name = 'frm_options';
-    public $menu;
-    public $mu_menu;
-    public $preview_page_id;
-    public $use_html;
-    public $jquery_css;
-    public $accordion_js;
-
-    public $success_msg;
-    public $blank_msg;
-    public $unique_msg;
-    public $invalid_msg;
-    public $failed_msg;
-    public $submit_value;
-    public $login_msg;
-    public $admin_permission;
-
-    public $email_to;
-    public $load_style;
-    public $custom_style;
-
-    public $pubkey;
-    public $privkey;
-    public $re_lang;
-    public $re_msg;
+	public $option_name = 'frm_options';
+	public $menu;
+	public $mu_menu;
+	public $preview_page_id;
+	public $use_html;
+	public $jquery_css;
+	public $accordion_js;
+
+	public $success_msg;
+	public $blank_msg;
+	public $unique_msg;
+	public $invalid_msg;
+	public $failed_msg;
+	public $submit_value;
+	public $login_msg;
+	public $admin_permission;
+
+	public $email_to;
+	public $load_style;
+	public $custom_style;
+
+	public $pubkey;
+	public $privkey;
+	public $re_lang;
+	public $re_msg;
 	public $re_multi;
 
-    public function __construct() {
-        if ( ! defined('ABSPATH') ) {
-            die('You are not allowed to call this page directly.');
-        }
+	public function __construct() {
+		if ( ! defined('ABSPATH') ) {
+			die('You are not allowed to call this page directly.');
+		}
 
-        $settings = get_transient($this->option_name);
+		$settings = get_transient($this->option_name);
 
-        if ( ! is_object($settings) ) {
-            $settings = $this->translate_settings($settings);
-        }
+		if ( ! is_object($settings) ) {
+			$settings = $this->translate_settings($settings);
+		}
 
-        foreach ( $settings as $setting_name => $setting ) {
-            $this->{$setting_name} = $setting;
-            unset($setting_name, $setting);
-        }
+		foreach ( $settings as $setting_name => $setting ) {
+			$this->{$setting_name} = $setting;
+			unset($setting_name, $setting);
+		}
 
-        $this->set_default_options();
-    }
+		$this->set_default_options();
+	}
 
 	private function translate_settings( $settings ) {
-        if ( $settings ) { //workaround for W3 total cache conflict
-            return unserialize(serialize($settings));
-        }
-
-        $settings = get_option($this->option_name);
-        if ( is_object($settings) ) {
-            set_transient($this->option_name, $settings);
-            return $settings;
-        }
-
-        // If unserializing didn't work
-        if ( $settings ) { //workaround for W3 total cache conflict
-            $settings = unserialize(serialize($settings));
-        } else {
-            $settings = $this;
-        }
-
-        update_option($this->option_name, $settings);
-        set_transient($this->option_name, $settings);
-
-        return $settings;
-    }
-
-    /**
-     * @return array
-     */
+		if ( $settings ) { //workaround for W3 total cache conflict
+			return unserialize(serialize($settings));
+		}
+
+		$settings = get_option($this->option_name);
+		if ( is_object($settings) ) {
+			set_transient($this->option_name, $settings);
+			return $settings;
+		}
+
+		// If unserializing didn't work
+		if ( $settings ) { //workaround for W3 total cache conflict
+			$settings = unserialize(serialize($settings));
+		} else {
+			$settings = $this;
+		}
+
+		update_option($this->option_name, $settings);
+		set_transient($this->option_name, $settings);
+
+		return $settings;
+	}
+
+	/**
+	 * @return array
+	 */
 	public function default_options() {
-        return array(
-            'menu'      => apply_filters( 'frm_default_menu', __( 'Forms', 'formidable' ) ),
-            'mu_menu'   => 0,
-            'preview_page_id' => 0,
-            'use_html'  => true,
-            'jquery_css' => false,
-            'accordion_js' => false,
+		return array(
+			'menu'      => apply_filters( 'frm_default_menu', __( 'Forms', 'formidable' ) ),
+			'mu_menu'   => 0,
+			'preview_page_id' => 0,
+			'use_html'  => true,
+			'jquery_css' => false,
+			'accordion_js' => false,
 
 			're_multi'  => 0,
 
-            'success_msg' => __( 'Your responses were successfully submitted. Thank you!', 'formidable' ),
-            'blank_msg' => __( 'This field cannot be blank.', 'formidable' ),
-            'unique_msg' => __( 'This value must be unique.', 'formidable' ),
-            'invalid_msg' => __( 'There was a problem with your submission. Errors are marked below.', 'formidable' ),
-            'failed_msg' => __( 'We\'re sorry. It looks like you\'ve  already submitted that.', 'formidable' ),
-            'submit_value' => __( 'Submit', 'formidable' ),
-            'login_msg' => __( 'You do not have permission to view this form.', 'formidable' ),
-            'admin_permission' => __( 'You do not have permission to do that', 'formidable' ),
+			'success_msg' => __( 'Your responses were successfully submitted. Thank you!', 'formidable' ),
+			'blank_msg' => __( 'This field cannot be blank.', 'formidable' ),
+			'unique_msg' => __( 'This value must be unique.', 'formidable' ),
+			'invalid_msg' => __( 'There was a problem with your submission. Errors are marked below.', 'formidable' ),
+			'failed_msg' => __( 'We\'re sorry. It looks like you\'ve  already submitted that.', 'formidable' ),
+			'submit_value' => __( 'Submit', 'formidable' ),
+			'login_msg' => __( 'You do not have permission to view this form.', 'formidable' ),
+			'admin_permission' => __( 'You do not have permission to do that', 'formidable' ),
 
-            'email_to' => '[admin_email]',
-        );
-    }
+			'email_to' => '[admin_email]',
+		);
+	}
 
 	private function set_default_options() {
-        $this->fill_recaptcha_settings();
-
-        if ( ! isset($this->load_style) ) {
-            if ( ! isset($this->custom_style) ) {
-                $this->custom_style = true;
-            }
-
-            $this->load_style = 'all';
-        }
-
-        $this->fill_with_defaults();
-
-        if ( is_multisite() && is_admin() ) {
-            $mu_menu = get_site_option('frm_admin_menu_name');
-            if ( $mu_menu && ! empty($mu_menu) ) {
-                $this->menu = $mu_menu;
-                $this->mu_menu = 1;
-            }
-        }
-
-        $frm_roles = FrmAppHelper::frm_capabilities('pro');
-        foreach ( $frm_roles as $frm_role => $frm_role_description ) {
-            if ( ! isset($this->$frm_role) ) {
-                $this->$frm_role = 'administrator';
-            }
-        }
-    }
+		$this->fill_recaptcha_settings();
+
+		if ( ! isset($this->load_style) ) {
+			if ( ! isset($this->custom_style) ) {
+				$this->custom_style = true;
+			}
+
+			$this->load_style = 'all';
+		}
+
+		$this->fill_with_defaults();
+
+		if ( is_multisite() && is_admin() ) {
+			$mu_menu = get_site_option('frm_admin_menu_name');
+			if ( $mu_menu && ! empty($mu_menu) ) {
+				$this->menu = $mu_menu;
+				$this->mu_menu = 1;
+			}
+		}
+
+		$frm_roles = FrmAppHelper::frm_capabilities('pro');
+		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
+			if ( ! isset($this->$frm_role) ) {
+				$this->$frm_role = 'administrator';
+			}
+		}
+	}
 
 	public function fill_with_defaults( $params = array() ) {
-        $settings = $this->default_options();
+		$settings = $this->default_options();
 
-        foreach ( $settings as $setting => $default ) {
+		foreach ( $settings as $setting => $default ) {
 			if ( isset( $params[ 'frm_' . $setting ] ) ) {
 				$this->{$setting} = $params[ 'frm_' . $setting ];
-            } else if ( ! isset($this->{$setting}) ) {
-                $this->{$setting} = $default;
-            }
+			} else if ( ! isset($this->{$setting}) ) {
+				$this->{$setting} = $default;
+			}
 
 			if ( $setting == 'menu' && empty( $this->{$setting} ) ) {
 				$this->{$setting} = $default;
 			}
 
-            unset($setting, $default);
-        }
-    }
+			unset($setting, $default);
+		}
+	}
 
-    private function fill_recaptcha_settings() {
-        $privkey = '';
+	private function fill_recaptcha_settings() {
+		$privkey = '';
 		$re_lang = '';
 
-        if ( ! isset($this->pubkey) ) {
-            // get the options from the database
-            $recaptcha_opt = is_multisite() ? get_site_option('recaptcha') : get_option('recaptcha');
-            $this->pubkey = isset($recaptcha_opt['pubkey']) ? $recaptcha_opt['pubkey'] : '';
-            $privkey = isset($recaptcha_opt['privkey']) ? $recaptcha_opt['privkey'] : $privkey;
-            $re_lang = isset($recaptcha_opt['re_lang']) ? $recaptcha_opt['re_lang'] : $re_lang;
-        }
+		if ( ! isset($this->pubkey) ) {
+			// get the options from the database
+			$recaptcha_opt = is_multisite() ? get_site_option('recaptcha') : get_option('recaptcha');
+			$this->pubkey = isset($recaptcha_opt['pubkey']) ? $recaptcha_opt['pubkey'] : '';
+			$privkey = isset($recaptcha_opt['privkey']) ? $recaptcha_opt['privkey'] : $privkey;
+			$re_lang = isset($recaptcha_opt['re_lang']) ? $recaptcha_opt['re_lang'] : $re_lang;
+		}
 
-        if ( ! isset($this->re_msg) || empty($this->re_msg) ) {
-            $this->re_msg = __( 'The reCAPTCHA was not entered correctly', 'formidable' );
-        }
+		if ( ! isset($this->re_msg) || empty($this->re_msg) ) {
+			$this->re_msg = __( 'The reCAPTCHA was not entered correctly', 'formidable' );
+		}
 
-        if ( ! isset($this->privkey) ) {
-            $this->privkey = $privkey;
-        }
+		if ( ! isset($this->privkey) ) {
+			$this->privkey = $privkey;
+		}
 
-        if ( ! isset($this->re_lang) ) {
-            $this->re_lang = $re_lang;
-        }
-    }
+		if ( ! isset($this->re_lang) ) {
+			$this->re_lang = $re_lang;
+		}
+	}
 
-    public function validate( $params, $errors ) {
-        $errors = apply_filters( 'frm_validate_settings', $errors, $params );
-        return $errors;
-    }
+	public function validate( $params, $errors ) {
+		$errors = apply_filters( 'frm_validate_settings', $errors, $params );
+		return $errors;
+	}
 
 	public function update( $params ) {
-        $this->fill_with_defaults($params);
-        $this->update_settings($params);
+		$this->fill_with_defaults($params);
+		$this->update_settings($params);
 
-        if ( $this->mu_menu ) {
-            update_site_option('frm_admin_menu_name', $this->menu);
-        } else if ( current_user_can('administrator') ) {
-            update_site_option('frm_admin_menu_name', false);
-        }
+		if ( $this->mu_menu ) {
+			update_site_option('frm_admin_menu_name', $this->menu);
+		} else if ( current_user_can('administrator') ) {
+			update_site_option('frm_admin_menu_name', false);
+		}
 
-        $this->update_roles($params);
+		$this->update_roles($params);
 
-        do_action( 'frm_update_settings', $params );
-    }
+		do_action( 'frm_update_settings', $params );
+	}
 
 	private function update_settings( $params ) {
-        $this->mu_menu = isset($params['frm_mu_menu']) ? $params['frm_mu_menu'] : 0;
+		$this->mu_menu = isset($params['frm_mu_menu']) ? $params['frm_mu_menu'] : 0;
 
-        $this->pubkey = trim($params['frm_pubkey']);
-        $this->privkey = $params['frm_privkey'];
-        $this->re_lang = $params['frm_re_lang'];
+		$this->pubkey = trim($params['frm_pubkey']);
+		$this->privkey = $params['frm_privkey'];
+		$this->re_lang = $params['frm_re_lang'];
 		$this->re_multi = isset( $params['frm_re_multi'] ) ? $params['frm_re_multi'] : 0;
 
-        $this->load_style = $params['frm_load_style'];
-        $this->preview_page_id = (int) $params['frm-preview-page-id'];
+		$this->load_style = $params['frm_load_style'];
+		$this->preview_page_id = (int) $params['frm-preview-page-id'];
 
-        $this->use_html = isset($params['frm_use_html']) ? $params['frm_use_html'] : 0;
-        //$this->custom_style = isset($params['frm_custom_style']) ? $params['frm_custom_style'] : 0;
+		$this->use_html = isset($params['frm_use_html']) ? $params['frm_use_html'] : 0;
+		//$this->custom_style = isset($params['frm_custom_style']) ? $params['frm_custom_style'] : 0;
 		$this->jquery_css = isset( $params['frm_jquery_css'] ) ? absint( $params['frm_jquery_css'] ) : 0;
 		$this->accordion_js = isset( $params['frm_accordion_js'] ) ? absint( $params['frm_accordion_js'] ) : 0;
-    }
+	}
 
 	private function update_roles( $params ) {
-        global $wp_roles;
+		global $wp_roles;
 
-        $frm_roles = FrmAppHelper::frm_capabilities();
-        $roles = get_editable_roles();
-        foreach ( $frm_roles as $frm_role => $frm_role_description ) {
-            $this->$frm_role = (array) ( isset( $params[ $frm_role ] ) ? $params[ $frm_role ] : 'administrator' );
+		$frm_roles = FrmAppHelper::frm_capabilities();
+		$roles = get_editable_roles();
+		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
+			$this->$frm_role = (array) ( isset( $params[ $frm_role ] ) ? $params[ $frm_role ] : 'administrator' );
 
-            // Make sure administrators always have permissions
-            if ( ! in_array( 'administrator', $this->$frm_role ) ) {
+			// Make sure administrators always have permissions
+			if ( ! in_array( 'administrator', $this->$frm_role ) ) {
 				array_push( $this->$frm_role, 'administrator' );
-            }
+			}
 
-            foreach ( $roles as $role => $details ) {
-                if ( in_array($role, $this->$frm_role) ) {
-    			    $wp_roles->add_cap( $role, $frm_role );
-    			} else {
-    			    $wp_roles->remove_cap( $role, $frm_role );
-    			}
-    		}
+			foreach ( $roles as $role => $details ) {
+				if ( in_array($role, $this->$frm_role) ) {
+					$wp_roles->add_cap( $role, $frm_role );
+				} else {
+					$wp_roles->remove_cap( $role, $frm_role );
+				}
+			}
 		}
-    }
+	}
 
 	public function store() {
-        // Save the posted value in the database
+		// Save the posted value in the database
 
-        update_option('frm_options', $this);
+		update_option('frm_options', $this);
 
-        delete_transient('frm_options');
-        set_transient('frm_options', $this);
+		delete_transient('frm_options');
+		set_transient('frm_options', $this);
 
-        do_action( 'frm_store_settings' );
-    }
+		do_action( 'frm_store_settings' );
+	}
 }

Spacing +45 added lines, -45 removed lines

@@ -29,19 +29,19 @@ 
 	public $re_multi;
 
     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.' );
         }
 
-        $settings = get_transient($this->option_name);
+        $settings = get_transient( $this->option_name );
 
-        if ( ! is_object($settings) ) {
-            $settings = $this->translate_settings($settings);
+        if ( ! is_object( $settings ) ) {
+            $settings = $this->translate_settings( $settings );
         }
 
         foreach ( $settings as $setting_name => $setting ) {
             $this->{$setting_name} = $setting;
-            unset($setting_name, $setting);
+            unset( $setting_name, $setting );
         }
 
         $this->set_default_options();
@@ -49,24 +49,24 @@ 
 
 	private function translate_settings( $settings ) {
         if ( $settings ) { //workaround for W3 total cache conflict
-            return unserialize(serialize($settings));
+            return unserialize( serialize( $settings ) );
         }
 
-        $settings = get_option($this->option_name);
-        if ( is_object($settings) ) {
-            set_transient($this->option_name, $settings);
+        $settings = get_option( $this->option_name );
+        if ( is_object( $settings ) ) {
+            set_transient( $this->option_name, $settings );
             return $settings;
         }
 
         // If unserializing didn't work
         if ( $settings ) { //workaround for W3 total cache conflict
-            $settings = unserialize(serialize($settings));
+            $settings = unserialize( serialize( $settings ) );
         } else {
             $settings = $this;
         }
 
-        update_option($this->option_name, $settings);
-        set_transient($this->option_name, $settings);
+        update_option( $this->option_name, $settings );
+        set_transient( $this->option_name, $settings );
 
         return $settings;
     }
@@ -101,8 +101,8 @@ 
 	private function set_default_options() {
         $this->fill_recaptcha_settings();
 
-        if ( ! isset($this->load_style) ) {
-            if ( ! isset($this->custom_style) ) {
+        if ( ! isset( $this->load_style ) ) {
+            if ( ! isset( $this->custom_style ) ) {
                 $this->custom_style = true;
             }
 
@@ -112,16 +112,16 @@ 
         $this->fill_with_defaults();
 
         if ( is_multisite() && is_admin() ) {
-            $mu_menu = get_site_option('frm_admin_menu_name');
-            if ( $mu_menu && ! empty($mu_menu) ) {
+            $mu_menu = get_site_option( 'frm_admin_menu_name' );
+            if ( $mu_menu && ! empty( $mu_menu ) ) {
                 $this->menu = $mu_menu;
                 $this->mu_menu = 1;
             }
         }
 
-        $frm_roles = FrmAppHelper::frm_capabilities('pro');
+        $frm_roles = FrmAppHelper::frm_capabilities( 'pro' );
         foreach ( $frm_roles as $frm_role => $frm_role_description ) {
-            if ( ! isset($this->$frm_role) ) {
+            if ( ! isset( $this->$frm_role ) ) {
                 $this->$frm_role = 'administrator';
             }
         }
@@ -131,9 +131,9 @@ 
         $settings = $this->default_options();
 
         foreach ( $settings as $setting => $default ) {
-			if ( isset( $params[ 'frm_' . $setting ] ) ) {
-				$this->{$setting} = $params[ 'frm_' . $setting ];
-            } else if ( ! isset($this->{$setting}) ) {
+			if ( isset( $params['frm_' . $setting] ) ) {
+				$this->{$setting} = $params['frm_' . $setting];
+            } else if ( ! isset( $this->{$setting}) ) {
                 $this->{$setting} = $default;
             }
 
@@ -141,7 +141,7 @@ 
 				$this->{$setting} = $default;
 			}
 
-            unset($setting, $default);
+            unset( $setting, $default );
         }
     }
 
@@ -149,23 +149,23 @@ 
         $privkey = '';
 		$re_lang = '';
 
-        if ( ! isset($this->pubkey) ) {
+        if ( ! isset( $this->pubkey ) ) {
             // get the options from the database
-            $recaptcha_opt = is_multisite() ? get_site_option('recaptcha') : get_option('recaptcha');
-            $this->pubkey = isset($recaptcha_opt['pubkey']) ? $recaptcha_opt['pubkey'] : '';
-            $privkey = isset($recaptcha_opt['privkey']) ? $recaptcha_opt['privkey'] : $privkey;
-            $re_lang = isset($recaptcha_opt['re_lang']) ? $recaptcha_opt['re_lang'] : $re_lang;
+            $recaptcha_opt = is_multisite() ? get_site_option( 'recaptcha' ) : get_option( 'recaptcha' );
+            $this->pubkey = isset( $recaptcha_opt['pubkey'] ) ? $recaptcha_opt['pubkey'] : '';
+            $privkey = isset( $recaptcha_opt['privkey'] ) ? $recaptcha_opt['privkey'] : $privkey;
+            $re_lang = isset( $recaptcha_opt['re_lang'] ) ? $recaptcha_opt['re_lang'] : $re_lang;
         }
 
-        if ( ! isset($this->re_msg) || empty($this->re_msg) ) {
+        if ( ! isset( $this->re_msg ) || empty( $this->re_msg ) ) {
             $this->re_msg = __( 'The reCAPTCHA was not entered correctly', 'formidable' );
         }
 
-        if ( ! isset($this->privkey) ) {
+        if ( ! isset( $this->privkey ) ) {
             $this->privkey = $privkey;
         }
 
-        if ( ! isset($this->re_lang) ) {
+        if ( ! isset( $this->re_lang ) ) {
             $this->re_lang = $re_lang;
         }
     }
@@ -176,24 +176,24 @@ 
     }
 
 	public function update( $params ) {
-        $this->fill_with_defaults($params);
-        $this->update_settings($params);
+        $this->fill_with_defaults( $params );
+        $this->update_settings( $params );
 
         if ( $this->mu_menu ) {
-            update_site_option('frm_admin_menu_name', $this->menu);
-        } else if ( current_user_can('administrator') ) {
-            update_site_option('frm_admin_menu_name', false);
+            update_site_option( 'frm_admin_menu_name', $this->menu );
+        } else if ( current_user_can( 'administrator' ) ) {
+            update_site_option( 'frm_admin_menu_name', false );
         }
 
-        $this->update_roles($params);
+        $this->update_roles( $params );
 
         do_action( 'frm_update_settings', $params );
     }
 
 	private function update_settings( $params ) {
-        $this->mu_menu = isset($params['frm_mu_menu']) ? $params['frm_mu_menu'] : 0;
+        $this->mu_menu = isset( $params['frm_mu_menu'] ) ? $params['frm_mu_menu'] : 0;
 
-        $this->pubkey = trim($params['frm_pubkey']);
+        $this->pubkey = trim( $params['frm_pubkey'] );
         $this->privkey = $params['frm_privkey'];
         $this->re_lang = $params['frm_re_lang'];
 		$this->re_multi = isset( $params['frm_re_multi'] ) ? $params['frm_re_multi'] : 0;
@@ -201,7 +201,7 @@ 
         $this->load_style = $params['frm_load_style'];
         $this->preview_page_id = (int) $params['frm-preview-page-id'];
 
-        $this->use_html = isset($params['frm_use_html']) ? $params['frm_use_html'] : 0;
+        $this->use_html = isset( $params['frm_use_html'] ) ? $params['frm_use_html'] : 0;
         //$this->custom_style = isset($params['frm_custom_style']) ? $params['frm_custom_style'] : 0;
 		$this->jquery_css = isset( $params['frm_jquery_css'] ) ? absint( $params['frm_jquery_css'] ) : 0;
 		$this->accordion_js = isset( $params['frm_accordion_js'] ) ? absint( $params['frm_accordion_js'] ) : 0;
@@ -213,7 +213,7 @@ 
         $frm_roles = FrmAppHelper::frm_capabilities();
         $roles = get_editable_roles();
         foreach ( $frm_roles as $frm_role => $frm_role_description ) {
-            $this->$frm_role = (array) ( isset( $params[ $frm_role ] ) ? $params[ $frm_role ] : 'administrator' );
+            $this->$frm_role = (array) ( isset( $params[$frm_role] ) ? $params[$frm_role] : 'administrator' );
 
             // Make sure administrators always have permissions
             if ( ! in_array( 'administrator', $this->$frm_role ) ) {
@@ -221,7 +221,7 @@ 
             }
 
             foreach ( $roles as $role => $details ) {
-                if ( in_array($role, $this->$frm_role) ) {
+                if ( in_array( $role, $this->$frm_role ) ) {
     			    $wp_roles->add_cap( $role, $frm_role );
     			} else {
     			    $wp_roles->remove_cap( $role, $frm_role );
@@ -233,10 +233,10 @@ 
 	public function store() {
         // Save the posted value in the database
 
-        update_option('frm_options', $this);
+        update_option( 'frm_options', $this );
 
-        delete_transient('frm_options');
-        set_transient('frm_options', $this);
+        delete_transient( 'frm_options' );
+        set_transient( 'frm_options', $this );
 
         do_action( 'frm_store_settings' );
     }

Braces +4 added lines, -2 removed lines

@@ -48,7 +48,8 @@ 
     }
 
 	private function translate_settings( $settings ) {
-        if ( $settings ) { //workaround for W3 total cache conflict
+        if ( $settings ) {
+//workaround for W3 total cache conflict
             return unserialize(serialize($settings));
         }
 
@@ -59,7 +60,8 @@ 
         }
 
         // If unserializing didn't work
-        if ( $settings ) { //workaround for W3 total cache conflict
+        if ( $settings ) {
+//workaround for W3 total cache conflict
             $settings = unserialize(serialize($settings));
         } else {
             $settings = $this;

classes/models/FrmEDD_SL_Plugin_Updater.php

Doc Comments +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 	 * @uses api_request()
 	 *
 	 * @param array   $_transient_data Update array build by WordPress.
-	 * @return array Modified update array with custom plugin data.
+	 * @return stdClass Modified update array with custom plugin data.
 	 */
 	public function check_update( $_transient_data ) {
 

Spacing +5 added lines, -5 removed lines

@@ -43,7 +43,7 @@ 
 		$this->version     = $_api_data['version'];
 		$this->wp_override = isset( $_api_data['wp_override'] ) ? (bool) $_api_data['wp_override'] : false;
 
-		$frm_edd_plugin_data[ $this->slug ] = $this->api_data;
+		$frm_edd_plugin_data[$this->slug] = $this->api_data;
 
 		// Set up hooks.
 		$this->init();
@@ -83,7 +83,7 @@ 
 			$_transient_data = new stdClass;
 		}
 
-		if ( ! empty( $_transient_data->response ) && ! empty( $_transient_data->response[ $this->name ] ) && false === $this->wp_override ) {
+		if ( ! empty( $_transient_data->response ) && ! empty( $_transient_data->response[$this->name] ) && false === $this->wp_override ) {
 			return $_transient_data;
 		}
 
@@ -97,12 +97,12 @@ 
 					$version_info->plugin = $this->name;
 				}
 
-				$_transient_data->response[ $this->name ] = $version_info;
+				$_transient_data->response[$this->name] = $version_info;
 
 			}
 
 			$_transient_data->last_checked = time();
-			$_transient_data->checked[ $this->name ] = $this->version;
+			$_transient_data->checked[$this->name] = $this->version;
 
 		}
 
@@ -245,7 +245,7 @@ 
 			wp_die( __( 'You do not have permission to install plugin updates', 'formidable' ), __( 'Error', 'formidable' ), array( 'response' => 403 ) );
 		}
 
-		$data         = $frm_edd_plugin_data[ $_REQUEST['slug'] ];
+		$data         = $frm_edd_plugin_data[$_REQUEST['slug']];
 		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_version_info' );
 		$version_info = get_transient( $cache_key );
 

classes/models/FrmFormAction.php

Indentation +229 added lines, -229 removed lines

@@ -8,7 +8,7 @@ 
 	public $action_options;     // Option array passed to wp_register_sidebar_widget()
 	public $control_options;	// Option array passed to wp_register_widget_control()
 
-    public $form_id;        // The ID of the form to evaluate
+	public $form_id;        // The ID of the form to evaluate
 	public $number = false;	// Unique ID number of the current instance.
 	public $id = '';		// Unique ID string of the current instance (id_base-number)
 	public $updated = false;	// Set true when we update the data after a POST submit - makes sure we don't do it twice.
@@ -29,7 +29,7 @@ 
 	}
 
 	/**
-     * Echo the settings update form
+	 * Echo the settings update form
 	 *
 	 * @param array $instance Current settings
 	 */
@@ -42,15 +42,15 @@ 
 	 * @return array of the default options
 	 */
 	public function get_defaults() {
-	    return array();
+		return array();
 	}
 
 	public function get_switch_fields() {
-	    return array();
+		return array();
 	}
 
 	public function migrate_values( $action, $form ) {
-	    return $action;
+		return $action;
 	}
 
 	// Functions you'll need to call.
@@ -69,24 +69,24 @@ 
 	 *	 - height: currently not used but may be needed in the future
 	 */
 	public function __construct( $id_base, $name, $action_options = array(), $control_options = array() ) {
-	    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.');
+		}
 
 		$this->id_base = strtolower($id_base);
 		$this->name = $name;
 		$this->option_name = 'frm_' . $this->id_base . '_action';
 
-        $default_options = array(
-            'classes'   => '',
-            'active'    => true,
+		$default_options = array(
+			'classes'   => '',
+			'active'    => true,
 			'event'     => array( 'create' ),
-            'limit'     => 1,
-            'force_event' => false,
-            'priority'  => 20,
-            'ajax_load' => true,
-            'tooltip'   => $name,
-        );
+			'limit'     => 1,
+			'force_event' => false,
+			'priority'  => 20,
+			'ajax_load' => true,
+			'tooltip'   => $name,
+		);
 
 		$action_options = apply_filters( 'frm_' . $id_base . '_action_options', $action_options );
 		$this->action_options = wp_parse_args( $action_options, $default_options );
@@ -135,132 +135,132 @@ 
 	}
 
 	public function prepare_new( $form_id = false ) {
-        if ( $form_id ) {
-            $this->form_id = $form_id;
-        }
-
-        $post_content = array();
-        $default_values = $this->get_global_defaults();
-
-        // fill default values
-        $post_content = wp_parse_args( $post_content, $default_values);
-
-        if ( ! isset($post_content['event']) && ! $this->action_options['force_event'] ) {
-            $post_content['event'] = array( reset($this->action_options['event']) );
-        }
-
-        $form_action = array(
-            'post_title'    => $this->name,
-            'post_content'  => $post_content,
-            'post_excerpt'  => $this->id_base,
-            'ID'            => '',
-            'post_status'   => 'publish',
-            'post_type'     => FrmFormActionsController::$action_post_type,
+		if ( $form_id ) {
+			$this->form_id = $form_id;
+		}
+
+		$post_content = array();
+		$default_values = $this->get_global_defaults();
+
+		// fill default values
+		$post_content = wp_parse_args( $post_content, $default_values);
+
+		if ( ! isset($post_content['event']) && ! $this->action_options['force_event'] ) {
+			$post_content['event'] = array( reset($this->action_options['event']) );
+		}
+
+		$form_action = array(
+			'post_title'    => $this->name,
+			'post_content'  => $post_content,
+			'post_excerpt'  => $this->id_base,
+			'ID'            => '',
+			'post_status'   => 'publish',
+			'post_type'     => FrmFormActionsController::$action_post_type,
 			'post_name'     => $this->form_id . '_' . $this->id_base . '_' . $this->number,
-            'menu_order'    => $this->form_id,
-        );
-        unset($post_content);
+			'menu_order'    => $this->form_id,
+		);
+		unset($post_content);
 
-        return (object) $form_action;
-    }
+		return (object) $form_action;
+	}
 
 	public function create( $form_id ) {
-        $this->form_id = $form_id;
+		$this->form_id = $form_id;
 
-        $action = $this->prepare_new();
+		$action = $this->prepare_new();
 
-        return $this->save_settings($action);
-    }
+		return $this->save_settings($action);
+	}
 
 	public function duplicate_form_actions( $form_id, $old_id ) {
-        if ( $form_id == $old_id ) {
-            // don't duplicate the actions if this is a template getting updated
-            return;
-        }
-
-        $this->form_id = $old_id;
-        $actions = $this->get_all( $old_id );
-
-        $this->form_id = $form_id;
-        foreach ( $actions as $action ) {
-            $this->duplicate_one($action, $form_id);
-            unset($action);
-        }
-    }
-
-    /* Check if imported action should be created or updated
+		if ( $form_id == $old_id ) {
+			// don't duplicate the actions if this is a template getting updated
+			return;
+		}
+
+		$this->form_id = $old_id;
+		$actions = $this->get_all( $old_id );
+
+		$this->form_id = $form_id;
+		foreach ( $actions as $action ) {
+			$this->duplicate_one($action, $form_id);
+			unset($action);
+		}
+	}
+
+	/* Check if imported action should be created or updated
     *
     * Since 2.0
     *
     * @param array $action
     * @return integer $post_id
     */
-    public function maybe_create_action( $action, $forms ) {
+	public function maybe_create_action( $action, $forms ) {
 		if ( isset( $action['ID'] ) && is_numeric( $action['ID'] ) && $forms[ $action['menu_order'] ] == 'updated' ) {
-            // Update action only
-            $action['post_content'] = FrmAppHelper::maybe_json_decode( $action['post_content'] );
-            $post_id = $this->save_settings( $action );
-        } else {
-            // Create action
-            $action['post_content'] = FrmAppHelper::maybe_json_decode($action['post_content']);
-            $post_id = $this->duplicate_one( (object) $action, $action['menu_order']);
-        }
-        return $post_id;
-    }
+			// Update action only
+			$action['post_content'] = FrmAppHelper::maybe_json_decode( $action['post_content'] );
+			$post_id = $this->save_settings( $action );
+		} else {
+			// Create action
+			$action['post_content'] = FrmAppHelper::maybe_json_decode($action['post_content']);
+			$post_id = $this->duplicate_one( (object) $action, $action['menu_order']);
+		}
+		return $post_id;
+	}
 
 	public function duplicate_one( $action, $form_id ) {
-        global $frm_duplicate_ids;
+		global $frm_duplicate_ids;
 
-        $action->menu_order = $form_id;
-        $switch = $this->get_global_switch_fields();
-        foreach ( (array) $action->post_content as $key => $val ) {
+		$action->menu_order = $form_id;
+		$switch = $this->get_global_switch_fields();
+		foreach ( (array) $action->post_content as $key => $val ) {
 			if ( is_numeric( $val ) && isset( $frm_duplicate_ids[ $val ] ) ) {
 				$action->post_content[ $key ] = $frm_duplicate_ids[ $val ];
-            } else if ( ! is_array( $val ) ) {
+			} else if ( ! is_array( $val ) ) {
 				$action->post_content[ $key ] = FrmFieldsHelper::switch_field_ids( $val );
 			} else if ( isset( $switch[ $key ] ) && is_array( $switch[ $key ] ) ) {
-                // loop through each value if empty
+				// loop through each value if empty
 				if ( empty( $switch[ $key ] ) ) {
 					$switch[ $key ] = array_keys( $val );
 				}
 
 				foreach ( $switch[ $key ] as $subkey ) {
 					$action->post_content[ $key ] = $this->duplicate_array_walk( $action->post_content[ $key ], $subkey, $val );
-                }
-            }
+				}
+			}
 
-            unset($key, $val);
-        }
-        unset($action->ID);
+			unset($key, $val);
+		}
+		unset($action->ID);
 
-        return $this->save_settings($action);
-    }
+		return $this->save_settings($action);
+	}
 
 	private function duplicate_array_walk( $action, $subkey, $val ) {
-        global $frm_duplicate_ids;
+		global $frm_duplicate_ids;
 
-        if ( is_array($subkey) ) {
-            foreach ( $subkey as $subkey2 ) {
-                foreach ( (array) $val as $ck => $cv ) {
-                    if ( is_array($cv) ) {
+		if ( is_array($subkey) ) {
+			foreach ( $subkey as $subkey2 ) {
+				foreach ( (array) $val as $ck => $cv ) {
+					if ( is_array($cv) ) {
 						$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey2, $cv );
 					} else if ( isset( $cv[ $subkey ] ) && is_numeric( $cv[ $subkey ] ) && isset( $frm_duplicate_ids[ $cv[ $subkey ] ] ) ) {
 						$action[ $ck ][ $subkey ] = $frm_duplicate_ids[ $cv[ $subkey ] ];
-                    }
-                }
-            }
-        } else {
-            foreach ( (array) $val as $ck => $cv ) {
-                if ( is_array($cv) ) {
+					}
+				}
+			}
+		} else {
+			foreach ( (array) $val as $ck => $cv ) {
+				if ( is_array($cv) ) {
 					$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey, $cv );
 				} else if ( $ck == $subkey && isset( $frm_duplicate_ids[ $cv ] ) ) {
 					$action[ $ck ] = $frm_duplicate_ids[ $cv ];
-                }
-            }
-        }
+				}
+			}
+		}
 
-        return $action;
-    }
+		return $action;
+	}
 
 	/**
 	 * Deal with changed settings.
@@ -269,7 +269,7 @@ 
 	 *
 	 */
  	public function update_callback( $form_id ) {
-        $this->form_id = $form_id;
+		$this->form_id = $form_id;
 
  		$all_instances = $this->get_settings();
 
@@ -284,25 +284,25 @@ 
  			return;
  		}
 
-        $action_ids = array();
+		$action_ids = array();
 
  		foreach ( $settings as $number => $new_instance ) {
  			$this->_set($number);
 
  			if ( ! isset($new_instance['post_title']) ) {
- 			    // settings were never opened, so don't update
- 			    $action_ids[] = $new_instance['ID'];
-         		$this->updated = true;
-         		continue;
+ 				// settings were never opened, so don't update
+ 				$action_ids[] = $new_instance['ID'];
+		 		$this->updated = true;
+		 		continue;
  			}
 
 			$old_instance = isset( $all_instances[ $number ] ) ? $all_instances[ $number ] : array();
 
  			$new_instance['post_type']  = FrmFormActionsController::$action_post_type;
 			$new_instance['post_name']  = $this->form_id . '_' . $this->id_base . '_' . $this->number;
-            $new_instance['menu_order']   = $this->form_id;
-            $new_instance['post_status']  = 'publish';
-            $new_instance['post_date'] = isset( $old_instance->post_date ) ? $old_instance->post_date : '';
+			$new_instance['menu_order']   = $this->form_id;
+			$new_instance['post_status']  = 'publish';
+			$new_instance['post_date'] = isset( $old_instance->post_date ) ? $old_instance->post_date : '';
 
  			$instance = $this->update( $new_instance, $old_instance );
 
@@ -328,9 +328,9 @@ 
 				$all_instances[ $number ] = $instance;
 			}
 
-            $action_ids[] = $this->save_settings($instance);
+			$action_ids[] = $this->save_settings($instance);
 
-     		$this->updated = true;
+	 		$this->updated = true;
  		}
 
  		return $action_ids;
@@ -342,59 +342,59 @@ 
 	}
 
 	public function get_single_action( $id ) {
-	    $action = get_post($id);
+		$action = get_post($id);
 		if ( $action ) {
 			$action = $this->prepare_action( $action );
 			$this->_set( $id );
 		}
-	    return $action;
+		return $action;
 	}
 
 	public function get_one( $form_id ) {
-	    return $this->get_all($form_id, 1);
+		return $this->get_all($form_id, 1);
 	}
 
-    public static function get_action_for_form( $form_id, $type = 'all', $limit = 99 ) {
-        $action_controls = FrmFormActionsController::get_form_actions( $type );
-        if ( empty($action_controls) ) {
-            // don't continue if there are no available actions
-            return array();
-        }
+	public static function get_action_for_form( $form_id, $type = 'all', $limit = 99 ) {
+		$action_controls = FrmFormActionsController::get_form_actions( $type );
+		if ( empty($action_controls) ) {
+			// don't continue if there are no available actions
+			return array();
+		}
 
-        if ( 'all' != $type ) {
-            return $action_controls->get_all( $form_id, $limit );
-        }
+		if ( 'all' != $type ) {
+			return $action_controls->get_all( $form_id, $limit );
+		}
 
 		$args = self::action_args( $form_id, $limit );
 		$actions = FrmAppHelper::check_cache( serialize( $args ), 'frm_actions', $args, 'get_posts' );
 
-        if ( ! $actions ) {
-            return array();
-        }
+		if ( ! $actions ) {
+			return array();
+		}
 
-        $settings = array();
-        foreach ( $actions as $action ) {
+		$settings = array();
+		foreach ( $actions as $action ) {
 			// some plugins/themes are formatting the post_excerpt
 			$action->post_excerpt = sanitize_title( $action->post_excerpt );
 
 			if ( ! isset( $action_controls[ $action->post_excerpt ] ) ) {
-                continue;
-            }
+				continue;
+			}
 
-            $action = $action_controls[ $action->post_excerpt ]->prepare_action( $action );
+			$action = $action_controls[ $action->post_excerpt ]->prepare_action( $action );
 			$settings[ $action->ID ] = $action;
 
 			if ( count( $settings ) >= $limit ) {
 				break;
 			}
-        }
+		}
 
-        if ( 1 === $limit ) {
-            $settings = reset($settings);
-        }
+		if ( 1 === $limit ) {
+			$settings = reset($settings);
+		}
 
-        return $settings;
-    }
+		return $settings;
+	}
 
 	/**
 	 * @param int $action_id
@@ -414,45 +414,45 @@ 
 	}
 
 	public function get_all( $form_id = false, $limit = 99 ) {
-	    if ( $form_id ) {
-	        $this->form_id = $form_id;
-	    }
+		if ( $form_id ) {
+			$this->form_id = $form_id;
+		}
 
-	    $type = $this->id_base;
+		$type = $this->id_base;
 
-	    global $frm_vars;
-	    $frm_vars['action_type'] = $type;
+		global $frm_vars;
+		$frm_vars['action_type'] = $type;
 
-	    add_filter( 'posts_where' , 'FrmFormActionsController::limit_by_type' );
+		add_filter( 'posts_where' , 'FrmFormActionsController::limit_by_type' );
 		$query = self::action_args( $form_id, $limit );
-        $query['post_status']      = 'any';
-        $query['suppress_filters'] = false;
+		$query['post_status']      = 'any';
+		$query['suppress_filters'] = false;
 
 		$actions = FrmAppHelper::check_cache( serialize( $query ) . '_type_' . $type, 'frm_actions', $query, 'get_posts' );
-        unset($query);
+		unset($query);
 
-        remove_filter( 'posts_where' , 'FrmFormActionsController::limit_by_type' );
+		remove_filter( 'posts_where' , 'FrmFormActionsController::limit_by_type' );
 
-        if ( empty($actions) ) {
-            return array();
-        }
+		if ( empty($actions) ) {
+			return array();
+		}
 
-        $settings = array();
-        foreach ( $actions as $action ) {
-            if ( count($settings) >= $limit ) {
-                continue;
-            }
+		$settings = array();
+		foreach ( $actions as $action ) {
+			if ( count($settings) >= $limit ) {
+				continue;
+			}
 
-            $action = $this->prepare_action($action);
+			$action = $this->prepare_action($action);
 
 			$settings[ $action->ID ] = $action;
-        }
+		}
 
-        if ( 1 === $limit ) {
-            $settings = reset($settings);
-        }
+		if ( 1 === $limit ) {
+			$settings = reset($settings);
+		}
 
-        return $settings;
+		return $settings;
 	}
 
 	public static function action_args( $form_id = 0, $limit = 99 ) {
@@ -475,45 +475,45 @@ 
 		$action->post_content = (array) FrmAppHelper::maybe_json_decode($action->post_content);
 		$action->post_excerpt = sanitize_title( $action->post_excerpt );
 
-        $default_values = $this->get_global_defaults();
+		$default_values = $this->get_global_defaults();
 
-        // fill default values
-        $action->post_content += $default_values;
+		// fill default values
+		$action->post_content += $default_values;
 
-        foreach ( $default_values as $k => $vals ) {
-            if ( is_array($vals) && ! empty($vals) ) {
+		foreach ( $default_values as $k => $vals ) {
+			if ( is_array($vals) && ! empty($vals) ) {
 				if ( 'event' == $k && ! $this->action_options['force_event'] && ! empty( $action->post_content[ $k ] ) ) {
-                    continue;
-                }
+					continue;
+				}
 				$action->post_content[ $k ] = wp_parse_args( $action->post_content[ $k ], $vals );
-            }
-        }
+			}
+		}
 
-        if ( ! is_array($action->post_content['event']) ) {
-            $action->post_content['event'] = explode(',', $action->post_content['event']);
-        }
+		if ( ! is_array($action->post_content['event']) ) {
+			$action->post_content['event'] = explode(',', $action->post_content['event']);
+		}
 
-        return $action;
+		return $action;
 	}
 
 	public function destroy( $form_id = false, $type = 'default' ) {
-	    global $wpdb;
+		global $wpdb;
 
-	    $this->form_id = $form_id;
+		$this->form_id = $form_id;
 
-	    $query = array( 'post_type' => FrmFormActionsController::$action_post_type );
-	    if ( $form_id ) {
-	        $query['menu_order'] = $form_id;
-	    }
-	    if ( 'all' != $type ) {
-	        $query['post_excerpt'] = $this->id_base;
-	    }
+		$query = array( 'post_type' => FrmFormActionsController::$action_post_type );
+		if ( $form_id ) {
+			$query['menu_order'] = $form_id;
+		}
+		if ( 'all' != $type ) {
+			$query['post_excerpt'] = $this->id_base;
+		}
 
-        $post_ids = FrmDb::get_col( $wpdb->posts, $query, 'ID' );
+		$post_ids = FrmDb::get_col( $wpdb->posts, $query, 'ID' );
 
-        foreach ( $post_ids as $id ) {
-            wp_delete_post($id);
-        }
+		foreach ( $post_ids as $id ) {
+			wp_delete_post($id);
+		}
 		self::clear_cache();
 	}
 
@@ -531,69 +531,69 @@ 
 	}
 
 	public function get_global_defaults() {
-	    $defaults = $this->get_defaults();
+		$defaults = $this->get_defaults();
 
-	    if ( ! isset($defaults['event']) ) {
+		if ( ! isset($defaults['event']) ) {
 			$defaults['event'] = array( 'create' );
-	    }
+		}
 
-	    if ( ! isset($defaults['conditions']) ) {
-	        $defaults['conditions'] = array(
-                'send_stop' => '',
-                'any_all'   => '',
-            );
-        }
+		if ( ! isset($defaults['conditions']) ) {
+			$defaults['conditions'] = array(
+				'send_stop' => '',
+				'any_all'   => '',
+			);
+		}
 
-        return $defaults;
+		return $defaults;
 	}
 
 	public function get_global_switch_fields() {
-	    $switch = $this->get_switch_fields();
+		$switch = $this->get_switch_fields();
 		$switch['conditions'] = array( 'hide_field' );
-	    return $switch;
+		return $switch;
 	}
 
 	/**
 	 * Migrate settings from form->options into new action.
 	 */
 	public function migrate_to_2( $form, $update = 'update' ) {
-        $action = $this->prepare_new($form->id);
-        $form->options = maybe_unserialize($form->options);
+		$action = $this->prepare_new($form->id);
+		$form->options = maybe_unserialize($form->options);
 
-        // fill with existing options
-        foreach ( $action->post_content as $name => $val ) {
+		// fill with existing options
+		foreach ( $action->post_content as $name => $val ) {
 			if ( isset( $form->options[ $name ] ) ) {
 				$action->post_content[ $name ] = $form->options[ $name ];
 				unset( $form->options[ $name ] );
-            }
-        }
+			}
+		}
 
-        $action = $this->migrate_values($action, $form);
+		$action = $this->migrate_values($action, $form);
 
-        // check if action already exists
-        $post_id = get_posts( array(
-            'name'          => $action->post_name,
-            'post_type'     => FrmFormActionsController::$action_post_type,
-            'post_status'   => $action->post_status,
-            'numberposts'   => 1,
-        ) );
+		// check if action already exists
+		$post_id = get_posts( array(
+			'name'          => $action->post_name,
+			'post_type'     => FrmFormActionsController::$action_post_type,
+			'post_status'   => $action->post_status,
+			'numberposts'   => 1,
+		) );
 
-        if ( empty($post_id) ) {
-            // create action now
-            $post_id = $this->save_settings($action);
-        }
+		if ( empty($post_id) ) {
+			// create action now
+			$post_id = $this->save_settings($action);
+		}
 
-        if ( $post_id && 'update' == $update ) {
-            global $wpdb;
-            $form->options = maybe_serialize($form->options);
+		if ( $post_id && 'update' == $update ) {
+			global $wpdb;
+			$form->options = maybe_serialize($form->options);
 
-            // update form options
+			// update form options
 			$wpdb->update( $wpdb->prefix . 'frm_forms', array( 'options' => $form->options ), array( 'id' => $form->id ) );
-	        FrmForm::clear_form_cache();
-        }
+			FrmForm::clear_form_cache();
+		}
 
-        return $post_id;
-    }
+		return $post_id;
+	}
 
 	public static function action_conditions_met( $action, $entry ) {
 		$notification = $action->post_content;

Spacing +90 added lines, -90 removed lines

@@ -2,16 +2,16 @@ 
 
 class FrmFormAction {
 
-	public $id_base;			// Root id for all actions of this type.
-	public $name;				// Name for this action type.
+	public $id_base; // Root id for all actions of this type.
+	public $name; // Name for this action type.
 	public $option_name;
-	public $action_options;     // Option array passed to wp_register_sidebar_widget()
-	public $control_options;	// Option array passed to wp_register_widget_control()
+	public $action_options; // Option array passed to wp_register_sidebar_widget()
+	public $control_options; // Option array passed to wp_register_widget_control()
 
-    public $form_id;        // The ID of the form to evaluate
-	public $number = false;	// Unique ID number of the current instance.
-	public $id = '';		// Unique ID string of the current instance (id_base-number)
-	public $updated = false;	// Set true when we update the data after a POST submit - makes sure we don't do it twice.
+    public $form_id; // The ID of the form to evaluate
+	public $number = false; // Unique ID number of the current instance.
+	public $id = ''; // Unique ID string of the current instance (id_base-number)
+	public $updated = false; // Set true when we update the data after a POST submit - makes sure we don't do it twice.
 
 	// Member functions that you must over-ride.
 
@@ -69,11 +69,11 @@ 
 	 *	 - height: currently not used but may be needed in the future
 	 */
 	public function __construct( $id_base, $name, $action_options = array(), $control_options = array() ) {
-	    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.' );
         }
 
-		$this->id_base = strtolower($id_base);
+		$this->id_base = strtolower( $id_base );
 		$this->name = $name;
 		$this->option_name = 'frm_' . $this->id_base . '_action';
 
@@ -143,10 +143,10 @@ 
         $default_values = $this->get_global_defaults();
 
         // fill default values
-        $post_content = wp_parse_args( $post_content, $default_values);
+        $post_content = wp_parse_args( $post_content, $default_values );
 
-        if ( ! isset($post_content['event']) && ! $this->action_options['force_event'] ) {
-            $post_content['event'] = array( reset($this->action_options['event']) );
+        if ( ! isset( $post_content['event'] ) && ! $this->action_options['force_event'] ) {
+            $post_content['event'] = array( reset( $this->action_options['event'] ) );
         }
 
         $form_action = array(
@@ -159,7 +159,7 @@ 
 			'post_name'     => $this->form_id . '_' . $this->id_base . '_' . $this->number,
             'menu_order'    => $this->form_id,
         );
-        unset($post_content);
+        unset( $post_content );
 
         return (object) $form_action;
     }
@@ -169,7 +169,7 @@ 
 
         $action = $this->prepare_new();
 
-        return $this->save_settings($action);
+        return $this->save_settings( $action );
     }
 
 	public function duplicate_form_actions( $form_id, $old_id ) {
@@ -183,8 +183,8 @@ 
 
         $this->form_id = $form_id;
         foreach ( $actions as $action ) {
-            $this->duplicate_one($action, $form_id);
-            unset($action);
+            $this->duplicate_one( $action, $form_id );
+            unset( $action );
         }
     }
 
@@ -196,14 +196,14 @@ 
     * @return integer $post_id
     */
     public function maybe_create_action( $action, $forms ) {
-		if ( isset( $action['ID'] ) && is_numeric( $action['ID'] ) && $forms[ $action['menu_order'] ] == 'updated' ) {
+		if ( isset( $action['ID'] ) && is_numeric( $action['ID'] ) && $forms[$action['menu_order']] == 'updated' ) {
             // Update action only
             $action['post_content'] = FrmAppHelper::maybe_json_decode( $action['post_content'] );
             $post_id = $this->save_settings( $action );
         } else {
             // Create action
-            $action['post_content'] = FrmAppHelper::maybe_json_decode($action['post_content']);
-            $post_id = $this->duplicate_one( (object) $action, $action['menu_order']);
+            $action['post_content'] = FrmAppHelper::maybe_json_decode( $action['post_content'] );
+            $post_id = $this->duplicate_one( (object) $action, $action['menu_order'] );
         }
         return $post_id;
     }
@@ -214,47 +214,47 @@ 
         $action->menu_order = $form_id;
         $switch = $this->get_global_switch_fields();
         foreach ( (array) $action->post_content as $key => $val ) {
-			if ( is_numeric( $val ) && isset( $frm_duplicate_ids[ $val ] ) ) {
-				$action->post_content[ $key ] = $frm_duplicate_ids[ $val ];
+			if ( is_numeric( $val ) && isset( $frm_duplicate_ids[$val] ) ) {
+				$action->post_content[$key] = $frm_duplicate_ids[$val];
             } else if ( ! is_array( $val ) ) {
-				$action->post_content[ $key ] = FrmFieldsHelper::switch_field_ids( $val );
-			} else if ( isset( $switch[ $key ] ) && is_array( $switch[ $key ] ) ) {
+				$action->post_content[$key] = FrmFieldsHelper::switch_field_ids( $val );
+			} else if ( isset( $switch[$key] ) && is_array( $switch[$key] ) ) {
                 // loop through each value if empty
-				if ( empty( $switch[ $key ] ) ) {
-					$switch[ $key ] = array_keys( $val );
+				if ( empty( $switch[$key] ) ) {
+					$switch[$key] = array_keys( $val );
 				}
 
-				foreach ( $switch[ $key ] as $subkey ) {
-					$action->post_content[ $key ] = $this->duplicate_array_walk( $action->post_content[ $key ], $subkey, $val );
+				foreach ( $switch[$key] as $subkey ) {
+					$action->post_content[$key] = $this->duplicate_array_walk( $action->post_content[$key], $subkey, $val );
                 }
             }
 
-            unset($key, $val);
+            unset( $key, $val );
         }
-        unset($action->ID);
+        unset( $action->ID );
 
-        return $this->save_settings($action);
+        return $this->save_settings( $action );
     }
 
 	private function duplicate_array_walk( $action, $subkey, $val ) {
         global $frm_duplicate_ids;
 
-        if ( is_array($subkey) ) {
+        if ( is_array( $subkey ) ) {
             foreach ( $subkey as $subkey2 ) {
                 foreach ( (array) $val as $ck => $cv ) {
-                    if ( is_array($cv) ) {
-						$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey2, $cv );
-					} else if ( isset( $cv[ $subkey ] ) && is_numeric( $cv[ $subkey ] ) && isset( $frm_duplicate_ids[ $cv[ $subkey ] ] ) ) {
-						$action[ $ck ][ $subkey ] = $frm_duplicate_ids[ $cv[ $subkey ] ];
+                    if ( is_array( $cv ) ) {
+						$action[$ck] = $this->duplicate_array_walk( $action[$ck], $subkey2, $cv );
+					} else if ( isset( $cv[$subkey] ) && is_numeric( $cv[$subkey] ) && isset( $frm_duplicate_ids[$cv[$subkey]] ) ) {
+						$action[$ck][$subkey] = $frm_duplicate_ids[$cv[$subkey]];
                     }
                 }
             }
         } else {
             foreach ( (array) $val as $ck => $cv ) {
-                if ( is_array($cv) ) {
-					$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey, $cv );
-				} else if ( $ck == $subkey && isset( $frm_duplicate_ids[ $cv ] ) ) {
-					$action[ $ck ] = $frm_duplicate_ids[ $cv ];
+                if ( is_array( $cv ) ) {
+					$action[$ck] = $this->duplicate_array_walk( $action[$ck], $subkey, $cv );
+				} else if ( $ck == $subkey && isset( $frm_duplicate_ids[$cv] ) ) {
+					$action[$ck] = $frm_duplicate_ids[$cv];
                 }
             }
         }
@@ -278,8 +278,8 @@ 
  			return;
  		}
 
-		if ( isset( $_POST[ $this->option_name ] ) && is_array( $_POST[ $this->option_name ] ) ) {
-			$settings = $_POST[ $this->option_name ];
+		if ( isset( $_POST[$this->option_name] ) && is_array( $_POST[$this->option_name] ) ) {
+			$settings = $_POST[$this->option_name];
  		} else {
  			return;
  		}
@@ -287,19 +287,19 @@ 
         $action_ids = array();
 
  		foreach ( $settings as $number => $new_instance ) {
- 			$this->_set($number);
+ 			$this->_set( $number );
 
- 			if ( ! isset($new_instance['post_title']) ) {
+ 			if ( ! isset( $new_instance['post_title'] ) ) {
  			    // settings were never opened, so don't update
  			    $action_ids[] = $new_instance['ID'];
          		$this->updated = true;
          		continue;
  			}
 
-			$old_instance = isset( $all_instances[ $number ] ) ? $all_instances[ $number ] : array();
+			$old_instance = isset( $all_instances[$number] ) ? $all_instances[$number] : array();
 
- 			$new_instance['post_type']  = FrmFormActionsController::$action_post_type;
-			$new_instance['post_name']  = $this->form_id . '_' . $this->id_base . '_' . $this->number;
+ 			$new_instance['post_type'] = FrmFormActionsController::$action_post_type;
+			$new_instance['post_name'] = $this->form_id . '_' . $this->id_base . '_' . $this->number;
             $new_instance['menu_order']   = $this->form_id;
             $new_instance['post_status']  = 'publish';
             $new_instance['post_date'] = isset( $old_instance->post_date ) ? $old_instance->post_date : '';
@@ -321,14 +321,14 @@ 
 			 */
 			$instance = apply_filters( 'frm_action_update_callback', $instance, $new_instance, $old_instance, $this );
 
-			$instance['post_content'] = apply_filters('frm_before_save_action', $instance['post_content'], $instance, $new_instance, $old_instance, $this);
+			$instance['post_content'] = apply_filters( 'frm_before_save_action', $instance['post_content'], $instance, $new_instance, $old_instance, $this );
 			$instance['post_content'] = apply_filters( 'frm_before_save_' . $this->id_base . '_action', $new_instance['post_content'], $instance, $new_instance, $old_instance, $this );
 
 			if ( false !== $instance ) {
-				$all_instances[ $number ] = $instance;
+				$all_instances[$number] = $instance;
 			}
 
-            $action_ids[] = $this->save_settings($instance);
+            $action_ids[] = $this->save_settings( $instance );
 
      		$this->updated = true;
  		}
@@ -342,7 +342,7 @@ 
 	}
 
 	public function get_single_action( $id ) {
-	    $action = get_post($id);
+	    $action = get_post( $id );
 		if ( $action ) {
 			$action = $this->prepare_action( $action );
 			$this->_set( $id );
@@ -351,12 +351,12 @@ 
 	}
 
 	public function get_one( $form_id ) {
-	    return $this->get_all($form_id, 1);
+	    return $this->get_all( $form_id, 1 );
 	}
 
     public static function get_action_for_form( $form_id, $type = 'all', $limit = 99 ) {
         $action_controls = FrmFormActionsController::get_form_actions( $type );
-        if ( empty($action_controls) ) {
+        if ( empty( $action_controls ) ) {
             // don't continue if there are no available actions
             return array();
         }
@@ -377,12 +377,12 @@ 
 			// some plugins/themes are formatting the post_excerpt
 			$action->post_excerpt = sanitize_title( $action->post_excerpt );
 
-			if ( ! isset( $action_controls[ $action->post_excerpt ] ) ) {
+			if ( ! isset( $action_controls[$action->post_excerpt] ) ) {
                 continue;
             }
 
-            $action = $action_controls[ $action->post_excerpt ]->prepare_action( $action );
-			$settings[ $action->ID ] = $action;
+            $action = $action_controls[$action->post_excerpt]->prepare_action( $action );
+			$settings[$action->ID] = $action;
 
 			if ( count( $settings ) >= $limit ) {
 				break;
@@ -390,7 +390,7 @@ 
         }
 
         if ( 1 === $limit ) {
-            $settings = reset($settings);
+            $settings = reset( $settings );
         }
 
         return $settings;
@@ -423,33 +423,33 @@ 
 	    global $frm_vars;
 	    $frm_vars['action_type'] = $type;
 
-	    add_filter( 'posts_where' , 'FrmFormActionsController::limit_by_type' );
+	    add_filter( 'posts_where', 'FrmFormActionsController::limit_by_type' );
 		$query = self::action_args( $form_id, $limit );
         $query['post_status']      = 'any';
         $query['suppress_filters'] = false;
 
 		$actions = FrmAppHelper::check_cache( serialize( $query ) . '_type_' . $type, 'frm_actions', $query, 'get_posts' );
-        unset($query);
+        unset( $query );
 
-        remove_filter( 'posts_where' , 'FrmFormActionsController::limit_by_type' );
+        remove_filter( 'posts_where', 'FrmFormActionsController::limit_by_type' );
 
-        if ( empty($actions) ) {
+        if ( empty( $actions ) ) {
             return array();
         }
 
         $settings = array();
         foreach ( $actions as $action ) {
-            if ( count($settings) >= $limit ) {
+            if ( count( $settings ) >= $limit ) {
                 continue;
             }
 
-            $action = $this->prepare_action($action);
+            $action = $this->prepare_action( $action );
 
-			$settings[ $action->ID ] = $action;
+			$settings[$action->ID] = $action;
         }
 
         if ( 1 === $limit ) {
-            $settings = reset($settings);
+            $settings = reset( $settings );
         }
 
         return $settings;
@@ -472,7 +472,7 @@ 
 	}
 
 	public function prepare_action( $action ) {
-		$action->post_content = (array) FrmAppHelper::maybe_json_decode($action->post_content);
+		$action->post_content = (array) FrmAppHelper::maybe_json_decode( $action->post_content );
 		$action->post_excerpt = sanitize_title( $action->post_excerpt );
 
         $default_values = $this->get_global_defaults();
@@ -481,16 +481,16 @@ 
         $action->post_content += $default_values;
 
         foreach ( $default_values as $k => $vals ) {
-            if ( is_array($vals) && ! empty($vals) ) {
-				if ( 'event' == $k && ! $this->action_options['force_event'] && ! empty( $action->post_content[ $k ] ) ) {
+            if ( is_array( $vals ) && ! empty( $vals ) ) {
+				if ( 'event' == $k && ! $this->action_options['force_event'] && ! empty( $action->post_content[$k] ) ) {
                     continue;
                 }
-				$action->post_content[ $k ] = wp_parse_args( $action->post_content[ $k ], $vals );
+				$action->post_content[$k] = wp_parse_args( $action->post_content[$k], $vals );
             }
         }
 
-        if ( ! is_array($action->post_content['event']) ) {
-            $action->post_content['event'] = explode(',', $action->post_content['event']);
+        if ( ! is_array( $action->post_content['event'] ) ) {
+            $action->post_content['event'] = explode( ',', $action->post_content['event'] );
         }
 
         return $action;
@@ -512,7 +512,7 @@ 
         $post_ids = FrmDb::get_col( $wpdb->posts, $query, 'ID' );
 
         foreach ( $post_ids as $id ) {
-            wp_delete_post($id);
+            wp_delete_post( $id );
         }
 		self::clear_cache();
 	}
@@ -533,11 +533,11 @@ 
 	public function get_global_defaults() {
 	    $defaults = $this->get_defaults();
 
-	    if ( ! isset($defaults['event']) ) {
+	    if ( ! isset( $defaults['event'] ) ) {
 			$defaults['event'] = array( 'create' );
 	    }
 
-	    if ( ! isset($defaults['conditions']) ) {
+	    if ( ! isset( $defaults['conditions'] ) ) {
 	        $defaults['conditions'] = array(
                 'send_stop' => '',
                 'any_all'   => '',
@@ -557,18 +557,18 @@ 
 	 * Migrate settings from form->options into new action.
 	 */
 	public function migrate_to_2( $form, $update = 'update' ) {
-        $action = $this->prepare_new($form->id);
-        $form->options = maybe_unserialize($form->options);
+        $action = $this->prepare_new( $form->id );
+        $form->options = maybe_unserialize( $form->options );
 
         // fill with existing options
         foreach ( $action->post_content as $name => $val ) {
-			if ( isset( $form->options[ $name ] ) ) {
-				$action->post_content[ $name ] = $form->options[ $name ];
-				unset( $form->options[ $name ] );
+			if ( isset( $form->options[$name] ) ) {
+				$action->post_content[$name] = $form->options[$name];
+				unset( $form->options[$name] );
             }
         }
 
-        $action = $this->migrate_values($action, $form);
+        $action = $this->migrate_values( $action, $form );
 
         // check if action already exists
         $post_id = get_posts( array(
@@ -578,14 +578,14 @@ 
             'numberposts'   => 1,
         ) );
 
-        if ( empty($post_id) ) {
+        if ( empty( $post_id ) ) {
             // create action now
-            $post_id = $this->save_settings($action);
+            $post_id = $this->save_settings( $action );
         }
 
         if ( $post_id && 'update' == $update ) {
             global $wpdb;
-            $form->options = maybe_serialize($form->options);
+            $form->options = maybe_serialize( $form->options );
 
             // update form options
 			$wpdb->update( $wpdb->prefix . 'frm_forms', array( 'options' => $form->options ), array( 'id' => $form->id ) );
@@ -617,18 +617,18 @@ 
 
 			$observed_value = self::get_value_from_entry( $entry, $condition['hide_field'] );
 
-			$stop = FrmFieldsHelper::value_meets_condition($observed_value, $condition['hide_field_cond'], $condition['hide_opt']);
+			$stop = FrmFieldsHelper::value_meets_condition( $observed_value, $condition['hide_field_cond'], $condition['hide_opt'] );
 
 			if ( $notification['conditions']['send_stop'] == 'send' ) {
 				$stop = $stop ? false : true;
 			}
 
-			$met[ $stop ] = $stop;
+			$met[$stop] = $stop;
 		}
 
 		if ( $notification['conditions']['any_all'] == 'all' && ! empty( $met ) && isset( $met[0] ) && isset( $met[1] ) ) {
-			$stop = ($notification['conditions']['send_stop'] == 'send');
-		} else if ( $notification['conditions']['any_all'] == 'any' && $notification['conditions']['send_stop'] == 'send' && isset($met[0]) ) {
+			$stop = ( $notification['conditions']['send_stop'] == 'send' );
+		} else if ( $notification['conditions']['any_all'] == 'any' && $notification['conditions']['send_stop'] == 'send' && isset( $met[0] ) ) {
 			$stop = false;
 		}
 
@@ -663,8 +663,8 @@ 
 	private static function get_value_from_entry( $entry, $field_id ) {
 		$observed_value = '';
 
-		if ( isset( $entry->metas[ $field_id ] ) ) {
-			$observed_value = $entry->metas[ $field_id ];
+		if ( isset( $entry->metas[$field_id] ) ) {
+			$observed_value = $entry->metas[$field_id];
 		} else if ( $entry->post_id && FrmAppHelper::pro_is_installed() ) {
 			$field = FrmField::getOne( $field_id );
 			$observed_value = FrmProEntryMetaHelper::get_post_or_meta_value( $entry, $field, array( 'links' => false, 'truncate' => false ) );

classes/models/FrmForm.php

Indentation +333 added lines, -333 removed lines

@@ -1,387 +1,387 @@ 
 <?php
 if ( ! defined('ABSPATH') ) {
-    die('You are not allowed to call this page directly.');
+	die('You are not allowed to call this page directly.');
 }
 
 class FrmForm {
 
-    /**
-     * @return int|boolean id on success or false on failure
-     */
-    public static function create( $values ) {
-        global $wpdb;
+	/**
+	 * @return int|boolean id on success or false on failure
+	 */
+	public static function create( $values ) {
+		global $wpdb;
 
-        $new_values = array(
+		$new_values = array(
 			'form_key'      => FrmAppHelper::get_unique_key( $values['form_key'], $wpdb->prefix . 'frm_forms', 'form_key' ),
-            'name'          => $values['name'],
-            'description'   => $values['description'],
-            'status'        => isset($values['status']) ? $values['status'] : 'draft',
-            'logged_in'     => isset($values['logged_in']) ? $values['logged_in'] : 0,
-            'is_template'   => isset($values['is_template']) ? (int) $values['is_template'] : 0,
+			'name'          => $values['name'],
+			'description'   => $values['description'],
+			'status'        => isset($values['status']) ? $values['status'] : 'draft',
+			'logged_in'     => isset($values['logged_in']) ? $values['logged_in'] : 0,
+			'is_template'   => isset($values['is_template']) ? (int) $values['is_template'] : 0,
 			'parent_form_id' => isset( $values['parent_form_id'] ) ? absint( $values['parent_form_id'] ) : 0,
-            'editable'      => isset($values['editable']) ? (int) $values['editable'] : 0,
-            'default_template' => isset($values['default_template']) ? (int) $values['default_template'] : 0,
-            'created_at'    => isset($values['created_at']) ? $values['created_at'] : current_time('mysql', 1),
-        );
+			'editable'      => isset($values['editable']) ? (int) $values['editable'] : 0,
+			'default_template' => isset($values['default_template']) ? (int) $values['default_template'] : 0,
+			'created_at'    => isset($values['created_at']) ? $values['created_at'] : current_time('mysql', 1),
+		);
 
 		$options = isset( $values['options'] ) ? (array) $values['options'] : array();
 		FrmFormsHelper::fill_form_options( $options, $values );
 
-        $options['before_html'] = isset($values['options']['before_html']) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html('before');
-        $options['after_html'] = isset($values['options']['after_html']) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html('after');
-        $options['submit_html'] = isset($values['options']['submit_html']) ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html('submit');
+		$options['before_html'] = isset($values['options']['before_html']) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html('before');
+		$options['after_html'] = isset($values['options']['after_html']) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html('after');
+		$options['submit_html'] = isset($values['options']['submit_html']) ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html('submit');
 
-        $options = apply_filters('frm_form_options_before_update', $options, $values);
-        $new_values['options'] = serialize($options);
+		$options = apply_filters('frm_form_options_before_update', $options, $values);
+		$new_values['options'] = serialize($options);
 
-        //if(isset($values['id']) && is_numeric($values['id']))
-        //    $new_values['id'] = $values['id'];
+		//if(isset($values['id']) && is_numeric($values['id']))
+		//    $new_values['id'] = $values['id'];
 
 		$wpdb->insert( $wpdb->prefix . 'frm_forms', $new_values );
 
-        $id = $wpdb->insert_id;
+		$id = $wpdb->insert_id;
 
 		// Clear form caching
 		self::clear_form_cache();
 
-        return $id;
-    }
+		return $id;
+	}
 
-    /**
-     * @return int|boolean ID on success or false on failure
-     */
-    public static function duplicate( $id, $template = false, $copy_keys = false, $blog_id = false ) {
-        global $wpdb;
+	/**
+	 * @return int|boolean ID on success or false on failure
+	 */
+	public static function duplicate( $id, $template = false, $copy_keys = false, $blog_id = false ) {
+		global $wpdb;
 
-        $values = self::getOne( $id, $blog_id );
-        if ( ! $values ) {
-            return false;
-        }
+		$values = self::getOne( $id, $blog_id );
+		if ( ! $values ) {
+			return false;
+		}
 
-        $new_key = $copy_keys ? $values->form_key : '';
+		$new_key = $copy_keys ? $values->form_key : '';
 
-        $new_values = array(
+		$new_values = array(
 			'form_key'      => FrmAppHelper::get_unique_key( $new_key, $wpdb->prefix . 'frm_forms', 'form_key' ),
-            'name'          => $values->name,
-            'description'   => $values->description,
-            'status'        => $template ? 'published' : 'draft',
-            'logged_in'     => $values->logged_in ? $values->logged_in : 0,
-            'editable'      => $values->editable ? $values->editable : 0,
-            'created_at'    => current_time('mysql', 1),
-            'is_template'   => $template ? 1 : 0,
-        );
-
-        if ( $blog_id ) {
-            $new_values['status'] = 'published';
-            $new_options = maybe_unserialize($values->options);
-            $new_options['email_to'] = get_option('admin_email');
-            $new_options['copy'] = false;
-            $new_values['options'] = $new_options;
-        } else {
-            $new_values['options'] = $values->options;
-        }
-
-        if ( is_array($new_values['options']) ) {
-            $new_values['options'] = serialize($new_values['options']);
-        }
+			'name'          => $values->name,
+			'description'   => $values->description,
+			'status'        => $template ? 'published' : 'draft',
+			'logged_in'     => $values->logged_in ? $values->logged_in : 0,
+			'editable'      => $values->editable ? $values->editable : 0,
+			'created_at'    => current_time('mysql', 1),
+			'is_template'   => $template ? 1 : 0,
+		);
+
+		if ( $blog_id ) {
+			$new_values['status'] = 'published';
+			$new_options = maybe_unserialize($values->options);
+			$new_options['email_to'] = get_option('admin_email');
+			$new_options['copy'] = false;
+			$new_values['options'] = $new_options;
+		} else {
+			$new_values['options'] = $values->options;
+		}
+
+		if ( is_array($new_values['options']) ) {
+			$new_values['options'] = serialize($new_values['options']);
+		}
 
 		$query_results = $wpdb->insert( $wpdb->prefix . 'frm_forms', $new_values );
 
-        if ( $query_results ) {
+		if ( $query_results ) {
 			// Clear form caching
 			self::clear_form_cache();
 
-            $form_id = $wpdb->insert_id;
-            FrmField::duplicate($id, $form_id, $copy_keys, $blog_id);
+			$form_id = $wpdb->insert_id;
+			FrmField::duplicate($id, $form_id, $copy_keys, $blog_id);
 
-            // update form settings after fields are created
+			// update form settings after fields are created
 			do_action( 'frm_after_duplicate_form', $form_id, $new_values, array( 'old_id' => $id ) );
-            return $form_id;
-        }
+			return $form_id;
+		}
 
-        return false;
-    }
+		return false;
+	}
 
 	public static function after_duplicate( $form_id, $values ) {
-        $new_opts = $values['options'] = maybe_unserialize($values['options']);
+		$new_opts = $values['options'] = maybe_unserialize($values['options']);
 
-        if ( isset($new_opts['success_msg']) ) {
-            $new_opts['success_msg'] = FrmFieldsHelper::switch_field_ids($new_opts['success_msg']);
-        }
+		if ( isset($new_opts['success_msg']) ) {
+			$new_opts['success_msg'] = FrmFieldsHelper::switch_field_ids($new_opts['success_msg']);
+		}
 
-        $new_opts = apply_filters('frm_after_duplicate_form_values', $new_opts, $form_id);
+		$new_opts = apply_filters('frm_after_duplicate_form_values', $new_opts, $form_id);
 
-        if ( $new_opts != $values['options'] ) {
-            global $wpdb;
+		if ( $new_opts != $values['options'] ) {
+			global $wpdb;
 			$wpdb->update( $wpdb->prefix . 'frm_forms', array( 'options' => maybe_serialize( $new_opts ) ), array( 'id' => $form_id ) );
-        }
-    }
+		}
+	}
 
-    /**
-     * @return int|boolean
-     */
-    public static function update( $id, $values, $create_link = false ) {
-        global $wpdb;
+	/**
+	 * @return int|boolean
+	 */
+	public static function update( $id, $values, $create_link = false ) {
+		global $wpdb;
 
-        if ( ! isset( $values['status'] ) && ( $create_link || isset( $values['options'] ) || isset( $values['item_meta'] ) || isset( $values['field_options'] ) ) ) {
-            $values['status'] = 'published';
-        }
+		if ( ! isset( $values['status'] ) && ( $create_link || isset( $values['options'] ) || isset( $values['item_meta'] ) || isset( $values['field_options'] ) ) ) {
+			$values['status'] = 'published';
+		}
 
-        if ( isset($values['form_key']) ) {
+		if ( isset($values['form_key']) ) {
 			$values['form_key'] = FrmAppHelper::get_unique_key( $values['form_key'], $wpdb->prefix . 'frm_forms', 'form_key', $id );
-        }
+		}
 
-        $form_fields = array( 'form_key', 'name', 'description', 'status', 'parent_form_id' );
+		$form_fields = array( 'form_key', 'name', 'description', 'status', 'parent_form_id' );
 
-        $new_values = self::set_update_options( array(), $values);
+		$new_values = self::set_update_options( array(), $values);
 
-        foreach ( $values as $value_key => $value ) {
+		foreach ( $values as $value_key => $value ) {
 			if ( $value_key && in_array( $value_key, $form_fields ) ) {
 				$new_values[ $value_key ] = $value;
-            }
-        }
+			}
+		}
 
-        if ( isset( $values['new_status'] ) && ! empty( $values['new_status'] ) ) {
-            $new_values['status'] = $values['new_status'];
-        }
+		if ( isset( $values['new_status'] ) && ! empty( $values['new_status'] ) ) {
+			$new_values['status'] = $values['new_status'];
+		}
 
-        if ( ! empty( $new_values ) ) {
+		if ( ! empty( $new_values ) ) {
 			$query_results = $wpdb->update( $wpdb->prefix . 'frm_forms', $new_values, array( 'id' => $id ) );
-            if ( $query_results ) {
+			if ( $query_results ) {
 				self::clear_form_cache();
-            }
-        } else {
-            $query_results = true;
-        }
-        unset($new_values);
+			}
+		} else {
+			$query_results = true;
+		}
+		unset($new_values);
 
-        $values = self::update_fields($id, $values);
+		$values = self::update_fields($id, $values);
 
 		do_action( 'frm_update_form', $id, $values );
 		do_action( 'frm_update_form_' . $id, $values );
 
-        return $query_results;
-    }
+		return $query_results;
+	}
 
-    /**
-     * @return array
-     */
+	/**
+	 * @return array
+	 */
 	public static function set_update_options( $new_values, $values ) {
-        if ( ! isset($values['options']) ) {
-            return $new_values;
-        }
+		if ( ! isset($values['options']) ) {
+			return $new_values;
+		}
 
 		$options = isset( $values['options'] ) ? (array) $values['options'] : array();
 		FrmFormsHelper::fill_form_options( $options, $values );
 
-        $options['custom_style'] = isset($values['options']['custom_style']) ? $values['options']['custom_style'] : 0;
-        $options['before_html'] = isset($values['options']['before_html']) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html('before');
-        $options['after_html'] = isset($values['options']['after_html']) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html('after');
-        $options['submit_html'] = (isset($values['options']['submit_html']) && $values['options']['submit_html'] != '') ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html('submit');
+		$options['custom_style'] = isset($values['options']['custom_style']) ? $values['options']['custom_style'] : 0;
+		$options['before_html'] = isset($values['options']['before_html']) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html('before');
+		$options['after_html'] = isset($values['options']['after_html']) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html('after');
+		$options['submit_html'] = (isset($values['options']['submit_html']) && $values['options']['submit_html'] != '') ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html('submit');
 
-        $options = apply_filters('frm_form_options_before_update', $options, $values);
-        $new_values['options'] = serialize($options);
+		$options = apply_filters('frm_form_options_before_update', $options, $values);
+		$new_values['options'] = serialize($options);
 
-        return $new_values;
-    }
+		return $new_values;
+	}
 
 
-    /**
-     * @return array
-     */
+	/**
+	 * @return array
+	 */
 	public static function update_fields( $id, $values ) {
 
-        if ( ! isset($values['options']) && ! isset($values['item_meta']) && ! isset($values['field_options']) ) {
-            return $values;
-        }
+		if ( ! isset($values['options']) && ! isset($values['item_meta']) && ! isset($values['field_options']) ) {
+			return $values;
+		}
 
-        $all_fields = FrmField::get_all_for_form($id);
-        if ( empty($all_fields) ) {
-            return $values;
-        }
+		$all_fields = FrmField::get_all_for_form($id);
+		if ( empty($all_fields) ) {
+			return $values;
+		}
 
-        if ( ! isset($values['item_meta']) ) {
-            $values['item_meta'] = array();
-        }
+		if ( ! isset($values['item_meta']) ) {
+			$values['item_meta'] = array();
+		}
 
-        $field_array = array();
-        $existing_keys = array_keys($values['item_meta']);
-        foreach ( $all_fields as $fid ) {
-            if ( ! in_array($fid->id, $existing_keys) && ( isset($values['frm_fields_submitted']) && in_array($fid->id, $values['frm_fields_submitted']) ) || isset($values['options']) ) {
+		$field_array = array();
+		$existing_keys = array_keys($values['item_meta']);
+		foreach ( $all_fields as $fid ) {
+			if ( ! in_array($fid->id, $existing_keys) && ( isset($values['frm_fields_submitted']) && in_array($fid->id, $values['frm_fields_submitted']) ) || isset($values['options']) ) {
 				$values['item_meta'][ $fid->id ] = '';
-            }
+			}
 			$field_array[ $fid->id ] = $fid;
-        }
-        unset($all_fields);
+		}
+		unset($all_fields);
 
-        foreach ( $values['item_meta'] as $field_id => $default_value ) {
+		foreach ( $values['item_meta'] as $field_id => $default_value ) {
 			if ( isset( $field_array[ $field_id ] ) ) {
 				$field = $field_array[ $field_id ];
-            } else {
-                $field = FrmField::getOne($field_id);
-            }
+			} else {
+				$field = FrmField::getOne($field_id);
+			}
 
-            if ( ! $field ) {
-                continue;
-            }
+			if ( ! $field ) {
+				continue;
+			}
 
 			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options'][ 'custom_html_' . $field_id ] ) );
 			if ( $is_settings_page ) {
-                //updating the settings page
+				//updating the settings page
 				if ( isset( $values['field_options'][ 'custom_html_' . $field_id ] ) ) {
 					$field->field_options['custom_html'] = isset( $values['field_options'][ 'custom_html_' . $field_id ] ) ? $values['field_options'][ 'custom_html_' . $field_id ] : ( isset( $field->field_options['custom_html'] ) ? $field->field_options['custom_html'] : FrmFieldsHelper::get_default_html( $field->type ) );
-                    $field->field_options = apply_filters('frm_update_form_field_options', $field->field_options, $field, $values);
+					$field->field_options = apply_filters('frm_update_form_field_options', $field->field_options, $field, $values);
 					FrmField::update( $field_id, array( 'field_options' => $field->field_options ) );
-                } else if ( $field->type == 'hidden' || $field->type == 'user_id' ) {
-                    $prev_opts = $field->field_options;
-                    $field->field_options = apply_filters('frm_update_form_field_options', $field->field_options, $field, $values);
-                    if ( $prev_opts != $field->field_options ) {
+				} else if ( $field->type == 'hidden' || $field->type == 'user_id' ) {
+					$prev_opts = $field->field_options;
+					$field->field_options = apply_filters('frm_update_form_field_options', $field->field_options, $field, $values);
+					if ( $prev_opts != $field->field_options ) {
 						FrmField::update( $field_id, array( 'field_options' => $field->field_options ) );
-                    }
-                    unset($prev_opts);
-                }
-            }
+					}
+					unset($prev_opts);
+				}
+			}
 
 			if ( $is_settings_page && ! defined( 'WP_IMPORTING' ) ) {
-                continue;
-            }
+				continue;
+			}
 
-            //updating the form
+			//updating the form
 			$update_options = FrmFieldsHelper::get_default_field_opts( $field->type, $field, true );
 			unset( $update_options['custom_html'] ); // don't check for POST html
 			$update_options = apply_filters( 'frm_field_options_to_update', $update_options );
 
 			foreach ( $update_options as $opt => $default ) {
 				$field->field_options[ $opt ] = isset( $values['field_options'][ $opt . '_' . $field_id ] ) ? trim( sanitize_text_field( $values['field_options'][ $opt . '_' . $field_id ] ) ) : $default;
-            }
+			}
 
-            $field->field_options = apply_filters('frm_update_field_options', $field->field_options, $field, $values);
+			$field->field_options = apply_filters('frm_update_field_options', $field->field_options, $field, $values);
 			$default_value = maybe_serialize( $values['item_meta'][ $field_id ] );
 			$field_key = isset( $values['field_options'][ 'field_key_' . $field_id ] ) ? $values['field_options'][ 'field_key_' . $field_id ] : $field->field_key;
 			$required = isset( $values['field_options'][ 'required_' . $field_id ] ) ? $values['field_options'][ 'required_' . $field_id ] : false;
 			$field_type = isset( $values['field_options'][ 'type_' . $field_id ] ) ? $values['field_options'][ 'type_' . $field_id ] : $field->type;
 			$field_description = isset( $values['field_options'][ 'description_' . $field_id ] ) ? $values['field_options'][ 'description_' . $field_id ] : $field->description;
 
-            FrmField::update($field_id, array(
-                'field_key' => $field_key, 'type' => $field_type,
-                'default_value' => $default_value, 'field_options' => $field->field_options,
-                'description' => $field_description, 'required' => $required,
-            ) );
+			FrmField::update($field_id, array(
+				'field_key' => $field_key, 'type' => $field_type,
+				'default_value' => $default_value, 'field_options' => $field->field_options,
+				'description' => $field_description, 'required' => $required,
+			) );
 
-            FrmField::delete_form_transient($field->form_id);
-        }
+			FrmField::delete_form_transient($field->form_id);
+		}
 		self::clear_form_cache();
 
-        return $values;
-    }
+		return $values;
+	}
 
-    /**
-     * @param string $status
-     * @return int|boolean
-     */
+	/**
+	 * @param string $status
+	 * @return int|boolean
+	 */
 	public static function set_status( $id, $status ) {
-        if ( 'trash' == $status ) {
-            return self::trash($id);
-        }
+		if ( 'trash' == $status ) {
+			return self::trash($id);
+		}
 
 		$statuses  = array( 'published', 'draft', 'trash' );
-        if ( ! in_array( $status, $statuses ) ) {
-            return false;
-        }
+		if ( ! in_array( $status, $statuses ) ) {
+			return false;
+		}
 
-        global $wpdb;
+		global $wpdb;
 
-        if ( is_array($id) ) {
+		if ( is_array($id) ) {
 			$where = array( 'id' => $id, 'parent_form_id' => $id, 'or' => 1 );
 			FrmDb::get_where_clause_and_values( $where );
 			array_unshift( $where['values'], $status );
 
 			$query_results = $wpdb->query( $wpdb->prepare( 'UPDATE ' . $wpdb->prefix . 'frm_forms SET status = %s ' . $where['where'], $where['values'] ) );
-        } else {
+		} else {
 			$query_results = $wpdb->update( $wpdb->prefix . 'frm_forms', array( 'status' => $status ), array( 'id' => $id ) );
 			$wpdb->update( $wpdb->prefix . 'frm_forms', array( 'status' => $status ), array( 'parent_form_id' => $id ) );
-        }
+		}
 
-        if ( $query_results ) {
+		if ( $query_results ) {
 			self::clear_form_cache();
-        }
+		}
 
-        return $query_results;
-    }
+		return $query_results;
+	}
 
-    /**
-     * @return int|boolean
-     */
+	/**
+	 * @return int|boolean
+	 */
 	public static function trash( $id ) {
-        if ( ! EMPTY_TRASH_DAYS ) {
-            return self::destroy( $id );
-        }
+		if ( ! EMPTY_TRASH_DAYS ) {
+			return self::destroy( $id );
+		}
 
-        $form = self::getOne($id);
-        if ( ! $form ) {
-            return false;
-        }
+		$form = self::getOne($id);
+		if ( ! $form ) {
+			return false;
+		}
 
-        $options = $form->options;
-        $options['trash_time'] = time();
+		$options = $form->options;
+		$options['trash_time'] = time();
 
-        global $wpdb;
-        $query_results = $wpdb->update(
+		global $wpdb;
+		$query_results = $wpdb->update(
 			$wpdb->prefix . 'frm_forms',
 			array( 'status' => 'trash', 'options' => serialize( $options ) ),
 			array( 'id' => $id )
-        );
+		);
 
-        $wpdb->update(
+		$wpdb->update(
 			$wpdb->prefix . 'frm_forms',
 			array( 'status' => 'trash', 'options' => serialize( $options ) ),
 			array( 'parent_form_id' => $id )
-        );
+		);
 
-        if ( $query_results ) {
+		if ( $query_results ) {
 			self::clear_form_cache();
-        }
+		}
 
-        return $query_results;
-    }
+		return $query_results;
+	}
 
-    /**
-     * @return int|boolean
-     */
+	/**
+	 * @return int|boolean
+	 */
 	public static function destroy( $id ) {
-        global $wpdb;
+		global $wpdb;
 
-        $form = self::getOne($id);
-        if ( ! $form ) {
-            return false;
-        }
+		$form = self::getOne($id);
+		if ( ! $form ) {
+			return false;
+		}
 		$id = $form->id;
 
-        // Disconnect the entries from this form
+		// Disconnect the entries from this form
 		$entries = FrmDb::get_col( $wpdb->prefix . 'frm_items', array( 'form_id' => $id ) );
-        foreach ( $entries as $entry_id ) {
-            FrmEntry::destroy($entry_id);
-            unset($entry_id);
-        }
+		foreach ( $entries as $entry_id ) {
+			FrmEntry::destroy($entry_id);
+			unset($entry_id);
+		}
 
-        // Disconnect the fields from this form
+		// Disconnect the fields from this form
 		$wpdb->query( $wpdb->prepare( 'DELETE fi FROM ' . $wpdb->prefix . 'frm_fields AS fi LEFT JOIN ' . $wpdb->prefix . 'frm_forms fr ON (fi.form_id = fr.id) WHERE fi.form_id=%d OR parent_form_id=%d', $id, $id ) );
 
 		$query_results = $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_forms WHERE id=%d OR parent_form_id=%d', $id, $id ) );
-        if ( $query_results ) {
-            // Delete all form actions linked to this form
-            $action_control = FrmFormActionsController::get_form_actions( 'email' );
-            $action_control->destroy($id, 'all');
+		if ( $query_results ) {
+			// Delete all form actions linked to this form
+			$action_control = FrmFormActionsController::get_form_actions( 'email' );
+			$action_control->destroy($id, 'all');
 
 			// Clear form caching
 			self::clear_form_cache();
 
 			do_action( 'frm_destroy_form', $id );
 			do_action( 'frm_destroy_form_' . $id );
-        }
+		}
 
-        return $query_results;
-    }
+		return $query_results;
+	}
 
 	/**
 	 * Delete trashed forms based on how long they have been trashed
@@ -413,49 +413,49 @@ 
 		return $count;
 	}
 
-    /**
-     * @return string form name
-     */
-    public static function &getName( $id ) {
-        global $wpdb;
-
-        $form = FrmAppHelper::check_cache($id, 'frm_form');
-        if ( $form ) {
-            $r = stripslashes($form->name);
-            return $r;
-        }
-
-        $query_key = is_numeric( $id ) ? 'id' : 'form_key';
-        $r = FrmDb::get_var( 'frm_forms', array( $query_key => $id ), 'name' );
-        $r = stripslashes($r);
-
-        return $r;
-    }
-
-    /**
-     * @param string $key
-     * @return int form id
-     */
+	/**
+	 * @return string form name
+	 */
+	public static function &getName( $id ) {
+		global $wpdb;
+
+		$form = FrmAppHelper::check_cache($id, 'frm_form');
+		if ( $form ) {
+			$r = stripslashes($form->name);
+			return $r;
+		}
+
+		$query_key = is_numeric( $id ) ? 'id' : 'form_key';
+		$r = FrmDb::get_var( 'frm_forms', array( $query_key => $id ), 'name' );
+		$r = stripslashes($r);
+
+		return $r;
+	}
+
+	/**
+	 * @param string $key
+	 * @return int form id
+	 */
 	public static function &getIdByKey( $key ) {
-        $id = FrmDb::get_var( 'frm_forms', array( 'form_key' => sanitize_title( $key ) ) );
-        return $id;
-    }
-
-    /**
-     * @param int $id
-     * @return string form key
-     */
+		$id = FrmDb::get_var( 'frm_forms', array( 'form_key' => sanitize_title( $key ) ) );
+		return $id;
+	}
+
+	/**
+	 * @param int $id
+	 * @return string form key
+	 */
 	public static function &getKeyById( $id ) {
-        $id = (int) $id;
-        $cache = FrmAppHelper::check_cache($id, 'frm_form');
-        if ( $cache ) {
-            return $cache->form_key;
-        }
+		$id = (int) $id;
+		$cache = FrmAppHelper::check_cache($id, 'frm_form');
+		if ( $cache ) {
+			return $cache->form_key;
+		}
 
-        $key = FrmDb::get_var( 'frm_forms', array( 'id' => $id ), 'form_key' );
+		$key = FrmDb::get_var( 'frm_forms', array( 'id' => $id ), 'form_key' );
 
-        return $key;
-    }
+		return $key;
+	}
 
 	/**
 	 * If $form is numeric, get the form object
@@ -468,47 +468,47 @@ 
 		}
 	}
 
-    /**
-     * @return object form
-     */
-    public static function getOne( $id, $blog_id = false ) {
-        global $wpdb;
+	/**
+	 * @return object form
+	 */
+	public static function getOne( $id, $blog_id = false ) {
+		global $wpdb;
 
-        if ( $blog_id && is_multisite() ) {
-            global $wpmuBaseTablePrefix;
+		if ( $blog_id && is_multisite() ) {
+			global $wpmuBaseTablePrefix;
 			$prefix = $wpmuBaseTablePrefix ? $wpmuBaseTablePrefix . $blog_id . '_' : $wpdb->get_blog_prefix( $blog_id );
 
 			$table_name = $prefix . 'frm_forms';
-        } else {
+		} else {
 			$table_name = $wpdb->prefix . 'frm_forms';
-            $cache = wp_cache_get($id, 'frm_form');
-            if ( $cache ) {
-                if ( isset($cache->options) ) {
-                    $cache->options = maybe_unserialize($cache->options);
-                }
+			$cache = wp_cache_get($id, 'frm_form');
+			if ( $cache ) {
+				if ( isset($cache->options) ) {
+					$cache->options = maybe_unserialize($cache->options);
+				}
 
-                return stripslashes_deep($cache);
-            }
-        }
+				return stripslashes_deep($cache);
+			}
+		}
 
-        if ( is_numeric($id) ) {
-            $where = array( 'id' => $id );
-        } else {
-            $where = array( 'form_key' => $id );
-        }
+		if ( is_numeric($id) ) {
+			$where = array( 'id' => $id );
+		} else {
+			$where = array( 'form_key' => $id );
+		}
 
-        $results = FrmDb::get_row( $table_name, $where );
+		$results = FrmDb::get_row( $table_name, $where );
 
-        if ( isset($results->options) ) {
+		if ( isset($results->options) ) {
 			FrmAppHelper::set_cache( $results->id, $results, 'frm_form' );
-            $results->options = maybe_unserialize($results->options);
-        }
-        return stripslashes_deep($results);
-    }
-
-    /**
-     * @return object|array of objects
-     */
+			$results->options = maybe_unserialize($results->options);
+		}
+		return stripslashes_deep($results);
+	}
+
+	/**
+	 * @return object|array of objects
+	 */
 	public static function getAll( $where = array(), $order_by = '', $limit = '' ) {
 		if ( is_array( $where ) && ! empty( $where ) ) {
 			$results = FrmDb::get_results( 'frm_forms', $where, '*', array( 'order_by' => $order_by, 'limit' => $limit ) );
@@ -532,8 +532,8 @@ 
 			$results = reset( $results );
 		}
 
-        return stripslashes_deep($results);
-    }
+		return stripslashes_deep($results);
+	}
 
 	/**
 	 * Get all published forms
@@ -551,47 +551,47 @@ 
 		return $forms;
 	}
 
-    /**
-     * @return int count of forms
-     */
-    public static function &get_count() {
-    	global $wpdb;
+	/**
+	 * @return int count of forms
+	 */
+	public static function &get_count() {
+		global $wpdb;
 
-    	$cache_key = 'frm_form_counts';
+		$cache_key = 'frm_form_counts';
 
-    	$counts = wp_cache_get( $cache_key, 'frm_form' );
-    	if ( false !== $counts ) {
-    	    return $counts;
-    	}
+		$counts = wp_cache_get( $cache_key, 'frm_form' );
+		if ( false !== $counts ) {
+			return $counts;
+		}
 
-        $results = (array) FrmDb::get_results( 'frm_forms', array( 'or' => 1, 'parent_form_id' => null, 'parent_form_id <' => 0 ), 'status, is_template' );
+		$results = (array) FrmDb::get_results( 'frm_forms', array( 'or' => 1, 'parent_form_id' => null, 'parent_form_id <' => 0 ), 'status, is_template' );
 
 		$statuses = array( 'published', 'draft', 'template', 'trash' );
-    	$counts = array_fill_keys( $statuses, 0 );
+		$counts = array_fill_keys( $statuses, 0 );
 
-    	foreach ( $results as $row ) {
-            if ( 'trash' != $row->status ) {
-    	        if ( $row->is_template ) {
+		foreach ( $results as $row ) {
+			if ( 'trash' != $row->status ) {
+				if ( $row->is_template ) {
 					$counts['template']++;
-    	        } else {
+				} else {
 					$counts['published']++;
-    	        }
-    	    } else {
+				}
+			} else {
 				$counts['trash']++;
-        	}
+			}
 
-    	    if ( 'draft' == $row->status ) {
+			if ( 'draft' == $row->status ) {
 				$counts['draft']++;
-    	    }
+			}
 
-    		unset($row);
-    	}
+			unset($row);
+		}
 
-    	$counts = (object) $counts;
+		$counts = (object) $counts;
 		FrmAppHelper::set_cache( $cache_key, $counts, 'frm_form' );
 
-    	return $counts;
-    }
+		return $counts;
+	}
 
 	/**
 	 * Clear form caching
@@ -604,14 +604,14 @@ 
 		FrmAppHelper::cache_delete_group( 'frm_form' );
 	}
 
-    /**
-     * @return array of errors
-     */
+	/**
+	 * @return array of errors
+	 */
 	public static function validate( $values ) {
-        $errors = array();
+		$errors = array();
 
-        return apply_filters('frm_validate_form', $errors, $values);
-    }
+		return apply_filters('frm_validate_form', $errors, $values);
+	}
 
 	public static function get_params( $form = null ) {
 		global $frm_vars;

Spacing +101 added lines, -101 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-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.' );
 }
 
 class FrmForm {
@@ -15,24 +15,24 @@ 
 			'form_key'      => FrmAppHelper::get_unique_key( $values['form_key'], $wpdb->prefix . 'frm_forms', 'form_key' ),
             'name'          => $values['name'],
             'description'   => $values['description'],
-            'status'        => isset($values['status']) ? $values['status'] : 'draft',
-            'logged_in'     => isset($values['logged_in']) ? $values['logged_in'] : 0,
-            'is_template'   => isset($values['is_template']) ? (int) $values['is_template'] : 0,
+            'status'        => isset( $values['status'] ) ? $values['status'] : 'draft',
+            'logged_in'     => isset( $values['logged_in'] ) ? $values['logged_in'] : 0,
+            'is_template'   => isset( $values['is_template'] ) ? (int) $values['is_template'] : 0,
 			'parent_form_id' => isset( $values['parent_form_id'] ) ? absint( $values['parent_form_id'] ) : 0,
-            'editable'      => isset($values['editable']) ? (int) $values['editable'] : 0,
-            'default_template' => isset($values['default_template']) ? (int) $values['default_template'] : 0,
-            'created_at'    => isset($values['created_at']) ? $values['created_at'] : current_time('mysql', 1),
+            'editable'      => isset( $values['editable'] ) ? (int) $values['editable'] : 0,
+            'default_template' => isset( $values['default_template'] ) ? (int) $values['default_template'] : 0,
+            'created_at'    => isset( $values['created_at'] ) ? $values['created_at'] : current_time( 'mysql', 1 ),
         );
 
 		$options = isset( $values['options'] ) ? (array) $values['options'] : array();
 		FrmFormsHelper::fill_form_options( $options, $values );
 
-        $options['before_html'] = isset($values['options']['before_html']) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html('before');
-        $options['after_html'] = isset($values['options']['after_html']) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html('after');
-        $options['submit_html'] = isset($values['options']['submit_html']) ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html('submit');
+        $options['before_html'] = isset( $values['options']['before_html'] ) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html( 'before' );
+        $options['after_html'] = isset( $values['options']['after_html'] ) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html( 'after' );
+        $options['submit_html'] = isset( $values['options']['submit_html'] ) ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html( 'submit' );
 
-        $options = apply_filters('frm_form_options_before_update', $options, $values);
-        $new_values['options'] = serialize($options);
+        $options = apply_filters( 'frm_form_options_before_update', $options, $values );
+        $new_values['options'] = serialize( $options );
 
         //if(isset($values['id']) && is_numeric($values['id']))
         //    $new_values['id'] = $values['id'];
@@ -67,22 +67,22 @@ 
             'status'        => $template ? 'published' : 'draft',
             'logged_in'     => $values->logged_in ? $values->logged_in : 0,
             'editable'      => $values->editable ? $values->editable : 0,
-            'created_at'    => current_time('mysql', 1),
+            'created_at'    => current_time( 'mysql', 1 ),
             'is_template'   => $template ? 1 : 0,
         );
 
         if ( $blog_id ) {
             $new_values['status'] = 'published';
-            $new_options = maybe_unserialize($values->options);
-            $new_options['email_to'] = get_option('admin_email');
+            $new_options = maybe_unserialize( $values->options );
+            $new_options['email_to'] = get_option( 'admin_email' );
             $new_options['copy'] = false;
             $new_values['options'] = $new_options;
         } else {
             $new_values['options'] = $values->options;
         }
 
-        if ( is_array($new_values['options']) ) {
-            $new_values['options'] = serialize($new_values['options']);
+        if ( is_array( $new_values['options'] ) ) {
+            $new_values['options'] = serialize( $new_values['options'] );
         }
 
 		$query_results = $wpdb->insert( $wpdb->prefix . 'frm_forms', $new_values );
@@ -92,7 +92,7 @@ 
 			self::clear_form_cache();
 
             $form_id = $wpdb->insert_id;
-            FrmField::duplicate($id, $form_id, $copy_keys, $blog_id);
+            FrmField::duplicate( $id, $form_id, $copy_keys, $blog_id );
 
             // update form settings after fields are created
 			do_action( 'frm_after_duplicate_form', $form_id, $new_values, array( 'old_id' => $id ) );
@@ -103,13 +103,13 @@ 
     }
 
 	public static function after_duplicate( $form_id, $values ) {
-        $new_opts = $values['options'] = maybe_unserialize($values['options']);
+        $new_opts = $values['options'] = maybe_unserialize( $values['options'] );
 
-        if ( isset($new_opts['success_msg']) ) {
-            $new_opts['success_msg'] = FrmFieldsHelper::switch_field_ids($new_opts['success_msg']);
+        if ( isset( $new_opts['success_msg'] ) ) {
+            $new_opts['success_msg'] = FrmFieldsHelper::switch_field_ids( $new_opts['success_msg'] );
         }
 
-        $new_opts = apply_filters('frm_after_duplicate_form_values', $new_opts, $form_id);
+        $new_opts = apply_filters( 'frm_after_duplicate_form_values', $new_opts, $form_id );
 
         if ( $new_opts != $values['options'] ) {
             global $wpdb;
@@ -127,17 +127,17 @@ 
             $values['status'] = 'published';
         }
 
-        if ( isset($values['form_key']) ) {
+        if ( isset( $values['form_key'] ) ) {
 			$values['form_key'] = FrmAppHelper::get_unique_key( $values['form_key'], $wpdb->prefix . 'frm_forms', 'form_key', $id );
         }
 
         $form_fields = array( 'form_key', 'name', 'description', 'status', 'parent_form_id' );
 
-        $new_values = self::set_update_options( array(), $values);
+        $new_values = self::set_update_options( array(), $values );
 
         foreach ( $values as $value_key => $value ) {
 			if ( $value_key && in_array( $value_key, $form_fields ) ) {
-				$new_values[ $value_key ] = $value;
+				$new_values[$value_key] = $value;
             }
         }
 
@@ -153,9 +153,9 @@ 
         } else {
             $query_results = true;
         }
-        unset($new_values);
+        unset( $new_values );
 
-        $values = self::update_fields($id, $values);
+        $values = self::update_fields( $id, $values );
 
 		do_action( 'frm_update_form', $id, $values );
 		do_action( 'frm_update_form_' . $id, $values );
@@ -167,20 +167,20 @@ 
      * @return array
      */
 	public static function set_update_options( $new_values, $values ) {
-        if ( ! isset($values['options']) ) {
+        if ( ! isset( $values['options'] ) ) {
             return $new_values;
         }
 
 		$options = isset( $values['options'] ) ? (array) $values['options'] : array();
 		FrmFormsHelper::fill_form_options( $options, $values );
 
-        $options['custom_style'] = isset($values['options']['custom_style']) ? $values['options']['custom_style'] : 0;
-        $options['before_html'] = isset($values['options']['before_html']) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html('before');
-        $options['after_html'] = isset($values['options']['after_html']) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html('after');
-        $options['submit_html'] = (isset($values['options']['submit_html']) && $values['options']['submit_html'] != '') ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html('submit');
+        $options['custom_style'] = isset( $values['options']['custom_style'] ) ? $values['options']['custom_style'] : 0;
+        $options['before_html'] = isset( $values['options']['before_html'] ) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html( 'before' );
+        $options['after_html'] = isset( $values['options']['after_html'] ) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html( 'after' );
+        $options['submit_html'] = ( isset( $values['options']['submit_html'] ) && $values['options']['submit_html'] != '' ) ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html( 'submit' );
 
-        $options = apply_filters('frm_form_options_before_update', $options, $values);
-        $new_values['options'] = serialize($options);
+        $options = apply_filters( 'frm_form_options_before_update', $options, $values );
+        $new_values['options'] = serialize( $options );
 
         return $new_values;
     }
@@ -191,54 +191,54 @@ 
      */
 	public static function update_fields( $id, $values ) {
 
-        if ( ! isset($values['options']) && ! isset($values['item_meta']) && ! isset($values['field_options']) ) {
+        if ( ! isset( $values['options'] ) && ! isset( $values['item_meta'] ) && ! isset( $values['field_options'] ) ) {
             return $values;
         }
 
-        $all_fields = FrmField::get_all_for_form($id);
-        if ( empty($all_fields) ) {
+        $all_fields = FrmField::get_all_for_form( $id );
+        if ( empty( $all_fields ) ) {
             return $values;
         }
 
-        if ( ! isset($values['item_meta']) ) {
+        if ( ! isset( $values['item_meta'] ) ) {
             $values['item_meta'] = array();
         }
 
         $field_array = array();
-        $existing_keys = array_keys($values['item_meta']);
+        $existing_keys = array_keys( $values['item_meta'] );
         foreach ( $all_fields as $fid ) {
-            if ( ! in_array($fid->id, $existing_keys) && ( isset($values['frm_fields_submitted']) && in_array($fid->id, $values['frm_fields_submitted']) ) || isset($values['options']) ) {
-				$values['item_meta'][ $fid->id ] = '';
+            if ( ! in_array( $fid->id, $existing_keys ) && ( isset( $values['frm_fields_submitted'] ) && in_array( $fid->id, $values['frm_fields_submitted'] ) ) || isset( $values['options'] ) ) {
+				$values['item_meta'][$fid->id] = '';
             }
-			$field_array[ $fid->id ] = $fid;
+			$field_array[$fid->id] = $fid;
         }
-        unset($all_fields);
+        unset( $all_fields );
 
         foreach ( $values['item_meta'] as $field_id => $default_value ) {
-			if ( isset( $field_array[ $field_id ] ) ) {
-				$field = $field_array[ $field_id ];
+			if ( isset( $field_array[$field_id] ) ) {
+				$field = $field_array[$field_id];
             } else {
-                $field = FrmField::getOne($field_id);
+                $field = FrmField::getOne( $field_id );
             }
 
             if ( ! $field ) {
                 continue;
             }
 
-			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options'][ 'custom_html_' . $field_id ] ) );
+			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options']['custom_html_' . $field_id] ) );
 			if ( $is_settings_page ) {
                 //updating the settings page
-				if ( isset( $values['field_options'][ 'custom_html_' . $field_id ] ) ) {
-					$field->field_options['custom_html'] = isset( $values['field_options'][ 'custom_html_' . $field_id ] ) ? $values['field_options'][ 'custom_html_' . $field_id ] : ( isset( $field->field_options['custom_html'] ) ? $field->field_options['custom_html'] : FrmFieldsHelper::get_default_html( $field->type ) );
-                    $field->field_options = apply_filters('frm_update_form_field_options', $field->field_options, $field, $values);
+				if ( isset( $values['field_options']['custom_html_' . $field_id] ) ) {
+					$field->field_options['custom_html'] = isset( $values['field_options']['custom_html_' . $field_id] ) ? $values['field_options']['custom_html_' . $field_id] : ( isset( $field->field_options['custom_html'] ) ? $field->field_options['custom_html'] : FrmFieldsHelper::get_default_html( $field->type ) );
+                    $field->field_options = apply_filters( 'frm_update_form_field_options', $field->field_options, $field, $values );
 					FrmField::update( $field_id, array( 'field_options' => $field->field_options ) );
                 } else if ( $field->type == 'hidden' || $field->type == 'user_id' ) {
                     $prev_opts = $field->field_options;
-                    $field->field_options = apply_filters('frm_update_form_field_options', $field->field_options, $field, $values);
+                    $field->field_options = apply_filters( 'frm_update_form_field_options', $field->field_options, $field, $values );
                     if ( $prev_opts != $field->field_options ) {
 						FrmField::update( $field_id, array( 'field_options' => $field->field_options ) );
                     }
-                    unset($prev_opts);
+                    unset( $prev_opts );
                 }
             }
 
@@ -252,23 +252,23 @@ 
 			$update_options = apply_filters( 'frm_field_options_to_update', $update_options );
 
 			foreach ( $update_options as $opt => $default ) {
-				$field->field_options[ $opt ] = isset( $values['field_options'][ $opt . '_' . $field_id ] ) ? trim( sanitize_text_field( $values['field_options'][ $opt . '_' . $field_id ] ) ) : $default;
+				$field->field_options[$opt] = isset( $values['field_options'][$opt . '_' . $field_id] ) ? trim( sanitize_text_field( $values['field_options'][$opt . '_' . $field_id] ) ) : $default;
             }
 
-            $field->field_options = apply_filters('frm_update_field_options', $field->field_options, $field, $values);
-			$default_value = maybe_serialize( $values['item_meta'][ $field_id ] );
-			$field_key = isset( $values['field_options'][ 'field_key_' . $field_id ] ) ? $values['field_options'][ 'field_key_' . $field_id ] : $field->field_key;
-			$required = isset( $values['field_options'][ 'required_' . $field_id ] ) ? $values['field_options'][ 'required_' . $field_id ] : false;
-			$field_type = isset( $values['field_options'][ 'type_' . $field_id ] ) ? $values['field_options'][ 'type_' . $field_id ] : $field->type;
-			$field_description = isset( $values['field_options'][ 'description_' . $field_id ] ) ? $values['field_options'][ 'description_' . $field_id ] : $field->description;
+            $field->field_options = apply_filters( 'frm_update_field_options', $field->field_options, $field, $values );
+			$default_value = maybe_serialize( $values['item_meta'][$field_id] );
+			$field_key = isset( $values['field_options']['field_key_' . $field_id] ) ? $values['field_options']['field_key_' . $field_id] : $field->field_key;
+			$required = isset( $values['field_options']['required_' . $field_id] ) ? $values['field_options']['required_' . $field_id] : false;
+			$field_type = isset( $values['field_options']['type_' . $field_id] ) ? $values['field_options']['type_' . $field_id] : $field->type;
+			$field_description = isset( $values['field_options']['description_' . $field_id] ) ? $values['field_options']['description_' . $field_id] : $field->description;
 
-            FrmField::update($field_id, array(
+            FrmField::update( $field_id, array(
                 'field_key' => $field_key, 'type' => $field_type,
                 'default_value' => $default_value, 'field_options' => $field->field_options,
                 'description' => $field_description, 'required' => $required,
             ) );
 
-            FrmField::delete_form_transient($field->form_id);
+            FrmField::delete_form_transient( $field->form_id );
         }
 		self::clear_form_cache();
 
@@ -281,17 +281,17 @@ 
      */
 	public static function set_status( $id, $status ) {
         if ( 'trash' == $status ) {
-            return self::trash($id);
+            return self::trash( $id );
         }
 
-		$statuses  = array( 'published', 'draft', 'trash' );
+		$statuses = array( 'published', 'draft', 'trash' );
         if ( ! in_array( $status, $statuses ) ) {
             return false;
         }
 
         global $wpdb;
 
-        if ( is_array($id) ) {
+        if ( is_array( $id ) ) {
 			$where = array( 'id' => $id, 'parent_form_id' => $id, 'or' => 1 );
 			FrmDb::get_where_clause_and_values( $where );
 			array_unshift( $where['values'], $status );
@@ -317,7 +317,7 @@ 
             return self::destroy( $id );
         }
 
-        $form = self::getOne($id);
+        $form = self::getOne( $id );
         if ( ! $form ) {
             return false;
         }
@@ -351,7 +351,7 @@ 
 	public static function destroy( $id ) {
         global $wpdb;
 
-        $form = self::getOne($id);
+        $form = self::getOne( $id );
         if ( ! $form ) {
             return false;
         }
@@ -360,8 +360,8 @@ 
         // Disconnect the entries from this form
 		$entries = FrmDb::get_col( $wpdb->prefix . 'frm_items', array( 'form_id' => $id ) );
         foreach ( $entries as $entry_id ) {
-            FrmEntry::destroy($entry_id);
-            unset($entry_id);
+            FrmEntry::destroy( $entry_id );
+            unset( $entry_id );
         }
 
         // Disconnect the fields from this form
@@ -371,7 +371,7 @@ 
         if ( $query_results ) {
             // Delete all form actions linked to this form
             $action_control = FrmFormActionsController::get_form_actions( 'email' );
-            $action_control->destroy($id, 'all');
+            $action_control->destroy( $id, 'all' );
 
 			// Clear form caching
 			self::clear_form_cache();
@@ -405,7 +405,7 @@ 
 			$form->options = maybe_unserialize( $form->options );
 			if ( ! isset( $form->options['trash_time'] ) || $form->options['trash_time'] < $delete_timestamp ) {
 				self::destroy( $form->id );
-				$count++;
+				$count ++;
 			}
 
 			unset( $form );
@@ -419,15 +419,15 @@ 
     public static function &getName( $id ) {
         global $wpdb;
 
-        $form = FrmAppHelper::check_cache($id, 'frm_form');
+        $form = FrmAppHelper::check_cache( $id, 'frm_form' );
         if ( $form ) {
-            $r = stripslashes($form->name);
+            $r = stripslashes( $form->name );
             return $r;
         }
 
         $query_key = is_numeric( $id ) ? 'id' : 'form_key';
         $r = FrmDb::get_var( 'frm_forms', array( $query_key => $id ), 'name' );
-        $r = stripslashes($r);
+        $r = stripslashes( $r );
 
         return $r;
     }
@@ -447,7 +447,7 @@ 
      */
 	public static function &getKeyById( $id ) {
         $id = (int) $id;
-        $cache = FrmAppHelper::check_cache($id, 'frm_form');
+        $cache = FrmAppHelper::check_cache( $id, 'frm_form' );
         if ( $cache ) {
             return $cache->form_key;
         }
@@ -481,17 +481,17 @@ 
 			$table_name = $prefix . 'frm_forms';
         } else {
 			$table_name = $wpdb->prefix . 'frm_forms';
-            $cache = wp_cache_get($id, 'frm_form');
+            $cache = wp_cache_get( $id, 'frm_form' );
             if ( $cache ) {
-                if ( isset($cache->options) ) {
-                    $cache->options = maybe_unserialize($cache->options);
+                if ( isset( $cache->options ) ) {
+                    $cache->options = maybe_unserialize( $cache->options );
                 }
 
-                return stripslashes_deep($cache);
+                return stripslashes_deep( $cache );
             }
         }
 
-        if ( is_numeric($id) ) {
+        if ( is_numeric( $id ) ) {
             $where = array( 'id' => $id );
         } else {
             $where = array( 'form_key' => $id );
@@ -499,11 +499,11 @@ 
 
         $results = FrmDb::get_row( $table_name, $where );
 
-        if ( isset($results->options) ) {
+        if ( isset( $results->options ) ) {
 			FrmAppHelper::set_cache( $results->id, $results, 'frm_form' );
-            $results->options = maybe_unserialize($results->options);
+            $results->options = maybe_unserialize( $results->options );
         }
-        return stripslashes_deep($results);
+        return stripslashes_deep( $results );
     }
 
     /**
@@ -532,7 +532,7 @@ 
 			$results = reset( $results );
 		}
 
-        return stripslashes_deep($results);
+        return stripslashes_deep( $results );
     }
 
 	/**
@@ -572,19 +572,19 @@ 
     	foreach ( $results as $row ) {
             if ( 'trash' != $row->status ) {
     	        if ( $row->is_template ) {
-					$counts['template']++;
+					$counts['template'] ++;
     	        } else {
-					$counts['published']++;
+					$counts['published'] ++;
     	        }
     	    } else {
-				$counts['trash']++;
+				$counts['trash'] ++;
         	}
 
     	    if ( 'draft' == $row->status ) {
-				$counts['draft']++;
+				$counts['draft'] ++;
     	    }
 
-    		unset($row);
+    		unset( $row );
     	}
 
     	$counts = (object) $counts;
@@ -610,7 +610,7 @@ 
 	public static function validate( $values ) {
         $errors = array();
 
-        return apply_filters('frm_validate_form', $errors, $values);
+        return apply_filters( 'frm_validate_form', $errors, $values );
     }
 
 	public static function get_params( $form = null ) {
@@ -622,11 +622,11 @@ 
 			self::maybe_get_form( $form );
 		}
 
-		if ( isset( $frm_vars['form_params'] ) && is_array( $frm_vars['form_params'] ) && isset( $frm_vars['form_params'][ $form->id ] ) ) {
-			return $frm_vars['form_params'][ $form->id ];
+		if ( isset( $frm_vars['form_params'] ) && is_array( $frm_vars['form_params'] ) && isset( $frm_vars['form_params'][$form->id] ) ) {
+			return $frm_vars['form_params'][$form->id];
 		}
 
-		$action_var = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
+		$action_var = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
 		$action = apply_filters( 'frm_show_new_entry_page', FrmAppHelper::get_param( $action_var, 'new', 'get', 'sanitize_title' ), $form );
 
 		$default_values = array(
@@ -644,15 +644,15 @@ 
 			//if there are two forms on the same page, make sure not to submit both
 			foreach ( $default_values as $var => $default ) {
 				if ( $var == 'action' ) {
-					$values[ $var ] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
+					$values[$var] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
 				} else {
-					$values[ $var ] = FrmAppHelper::get_param( $var, $default );
+					$values[$var] = FrmAppHelper::get_param( $var, $default );
 				}
 				unset( $var, $default );
 			}
 		} else {
 			foreach ( $default_values as $var => $default ) {
-				$values[ $var ] = $default;
+				$values[$var] = $default;
 				unset( $var, $default );
 			}
 		}
@@ -667,7 +667,7 @@ 
 	public static function list_page_params() {
 		$values = array();
 		foreach ( array( 'template' => 0, 'id' => '', 'paged' => 1, 'form' => '', 'search' => '', 'sort' => '', 'sdir' => '' ) as $var => $default ) {
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default );
+			$values[$var] = FrmAppHelper::get_param( $var, $default );
 		}
 
 		return $values;
@@ -687,7 +687,7 @@ 
 			'field_id' => '', 'search' => '', 'sort' => '', 'sdir' => '', 'fid' => '',
 			'keep_post' => '',
 		) as $var => $default ) {
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default );
+			$values[$var] = FrmAppHelper::get_param( $var, $default );
 		}
 
 		return $values;
@@ -729,16 +729,16 @@ 
 		$small_form = new stdClass();
 		foreach ( array( 'id', 'form_key', 'name' ) as $var ) {
 			$small_form->{$var} = $form->{$var};
-			unset($var);
+			unset( $var );
 		}
 
 		$frm_vars['forms_loaded'][] = $small_form;
 
-		if ( $this_load && empty($global_load) ) {
+		if ( $this_load && empty( $global_load ) ) {
 			$global_load = $frm_vars['load_css'] = true;
 		}
 
-		return ( ( ! isset($frm_vars['css_loaded']) || ! $frm_vars['css_loaded'] ) && $global_load );
+		return ( ( ! isset( $frm_vars['css_loaded'] ) || ! $frm_vars['css_loaded'] ) && $global_load );
 	}
 
 	public static function show_submit( $form ) {

classes/helpers/FrmXMLHelper.php

Indentation +511 added lines, -511 removed lines

@@ -23,30 +23,30 @@ 
 	}
 
 	public static function import_xml( $file ) {
-        $defaults = array(
-            'forms' => 0, 'fields' => 0, 'terms' => 0,
-            'posts' => 0, 'views' => 0, 'actions' => 0,
-            'styles' => 0,
-        );
-
-        $imported = array(
-            'imported' => $defaults,
+		$defaults = array(
+			'forms' => 0, 'fields' => 0, 'terms' => 0,
+			'posts' => 0, 'views' => 0, 'actions' => 0,
+			'styles' => 0,
+		);
+
+		$imported = array(
+			'imported' => $defaults,
 			'updated'  => $defaults,
 			'forms'    => array(),
 			'terms'    => array(),
-        );
+		);
 
-        unset($defaults);
+		unset($defaults);
 
 		if ( ! defined( 'WP_IMPORTING' ) ) {
-            define('WP_IMPORTING', true);
-        }
+			define('WP_IMPORTING', true);
+		}
 
 		if ( ! class_exists( 'DOMDocument' ) ) {
-            return new WP_Error( 'SimpleXML_parse_error', __( 'Your server does not have XML enabled', 'formidable' ), libxml_get_errors() );
-        }
+			return new WP_Error( 'SimpleXML_parse_error', __( 'Your server does not have XML enabled', 'formidable' ), libxml_get_errors() );
+		}
 
-        $dom = new DOMDocument;
+		$dom = new DOMDocument;
 		$success = $dom->loadXML( file_get_contents( $file ) );
 		if ( ! $success ) {
 			return new WP_Error( 'SimpleXML_parse_error', __( 'There was an error when reading this XML file', 'formidable' ), libxml_get_errors() );
@@ -64,45 +64,45 @@ 
 			return new WP_Error( 'SimpleXML_parse_error', __( 'There was an error when reading this XML file', 'formidable' ), libxml_get_errors() );
 		}
 
-        // add terms, forms (form and field ids), posts (post ids), and entries to db, in that order
+		// add terms, forms (form and field ids), posts (post ids), and entries to db, in that order
 		foreach ( array( 'term', 'form', 'view' ) as $item_type ) {
-            // grab cats, tags, and terms, or forms or posts
-            if ( isset($xml->{$item_type} ) ) {
+			// grab cats, tags, and terms, or forms or posts
+			if ( isset($xml->{$item_type} ) ) {
 				$function_name = 'import_xml_' . $item_type . 's';
 				$imported = self::$function_name( $xml->{$item_type}, $imported );
 				unset( $function_name, $xml->{$item_type} );
-            }
-        }
+			}
+		}
 
-	    $return = apply_filters('frm_importing_xml', $imported, $xml );
+		$return = apply_filters('frm_importing_xml', $imported, $xml );
 
-	    return $return;
-    }
+		return $return;
+	}
 
 	public static function import_xml_terms( $terms, $imported ) {
-        foreach ( $terms as $t ) {
+		foreach ( $terms as $t ) {
 			if ( term_exists( (string) $t->term_slug, (string) $t->term_taxonomy ) ) {
-			    continue;
+				continue;
 			}
 
 			$parent = self::get_term_parent_id( $t );
 
 			$term = wp_insert_term( (string) $t->term_name, (string) $t->term_taxonomy, array(
-                'slug'          => (string) $t->term_slug,
-                'description'   => (string) $t->term_description,
+				'slug'          => (string) $t->term_slug,
+				'description'   => (string) $t->term_description,
 				'parent'        => empty( $parent ) ? 0 : $parent,
-            ));
+			));
 
 			if ( $term && is_array( $term ) ) {
-                $imported['imported']['terms']++;
+				$imported['imported']['terms']++;
 				$imported['terms'][ (int) $t->term_id ] = $term['term_id'];
-            }
+			}
 
 			unset( $term, $t );
 		}
 
 		return $imported;
-    }
+	}
 
 	/**
 	 * @since 2.0.8
@@ -127,11 +127,11 @@ 
 		self::put_child_forms_first( $forms );
 
 		foreach ( $forms as $item ) {
-            $form = self::fill_form( $item );
+			$form = self::fill_form( $item );
 
 			self::update_custom_style_setting_on_import( $form );
 
-	        $this_form = self::maybe_get_form( $form );
+			$this_form = self::maybe_get_form( $form );
 
 			$old_id = $form_fields = false;
 			if ( ! empty( $this_form ) ) {
@@ -141,35 +141,35 @@ 
 				$form_fields = self::get_form_fields( $form_id );
 			} else {
 				$form_id = FrmForm::create( $form );
-		        if ( $form_id ) {
-		            $imported['imported']['forms']++;
-		            // Keep track of whether this specific form was updated or not
+				if ( $form_id ) {
+					$imported['imported']['forms']++;
+					// Keep track of whether this specific form was updated or not
 					$imported['form_status'][ $form_id ] = 'imported';
 					self::track_imported_child_forms( (int) $form_id, $form['parent_form_id'], $child_forms );
-		        }
+				}
 			}
 
 			self::import_xml_fields( $item->field, $form_id, $this_form, $form_fields, $imported );
 
 			self::delete_removed_fields( $form_fields );
 
-		    // Update field ids/keys to new ones
+			// Update field ids/keys to new ones
 			do_action( 'frm_after_duplicate_form', $form_id, $form, array( 'old_id' => $old_id ) );
 
 			$imported['forms'][ (int) $item->id ] = $form_id;
 
-            // Send pre 2.0 form options through function that creates actions
-            self::migrate_form_settings_to_actions( $form['options'], $form_id, $imported, $switch = true );
+			// Send pre 2.0 form options through function that creates actions
+			self::migrate_form_settings_to_actions( $form['options'], $form_id, $imported, $switch = true );
 
 			do_action( 'frm_after_import_form', $form_id, $form );
 
-		    unset($form, $item);
+			unset($form, $item);
 		}
 
 		self::maybe_update_child_form_parent_id( $imported['forms'], $child_forms );
 
 		return $imported;
-    }
+	}
 
 	private static function fill_form( $item ) {
 		$form = array(
@@ -237,11 +237,11 @@ 
 	}
 
 	/**
-	* Put child forms first so they will be imported before parents
-	*
-	* @since 2.0.16
-	* @param array $forms
-	*/
+	 * Put child forms first so they will be imported before parents
+	 *
+	 * @since 2.0.16
+	 * @param array $forms
+	 */
 	private static function put_child_forms_first( &$forms ) {
 		$child_forms = array();
 		$regular_forms = array();
@@ -260,13 +260,13 @@ 
 	}
 
 	/**
-	* Keep track of all imported child forms
-	*
-	* @since 2.0.16
-	* @param int $form_id
-	* @param int $parent_form_id
-	* @param array $child_forms
-	*/
+	 * Keep track of all imported child forms
+	 *
+	 * @since 2.0.16
+	 * @param int $form_id
+	 * @param int $parent_form_id
+	 * @param array $child_forms
+	 */
 	private static function track_imported_child_forms( $form_id, $parent_form_id, &$child_forms ) {
 		if ( $parent_form_id ) {
 			$child_forms[ $form_id ] = $parent_form_id;
@@ -274,13 +274,13 @@ 
 	}
 
 	/**
-	* Update the parent_form_id on imported child forms
-	* Child forms are imported first so their parent_form_id will need to be updated after the parent is imported
-	*
-	* @since 2.0.6
-	* @param array $imported_forms
-	* @param array $child_forms
-	*/
+	 * Update the parent_form_id on imported child forms
+	 * Child forms are imported first so their parent_form_id will need to be updated after the parent is imported
+	 *
+	 * @since 2.0.6
+	 * @param array $imported_forms
+	 * @param array $child_forms
+	 */
 	private static function maybe_update_child_form_parent_id( $imported_forms, $child_forms ) {
 		foreach ( $child_forms as $child_form_id => $old_parent_form_id ) {
 
@@ -294,28 +294,28 @@ 
 	}
 
 	/**
-	* Import all fields for a form
-	* @since 2.0.13
-	*
-	* TODO: Cut down on params
-	*/
+	 * Import all fields for a form
+	 * @since 2.0.13
+	 *
+	 * TODO: Cut down on params
+	 */
 	private static function import_xml_fields( $xml_fields, $form_id, $this_form, &$form_fields, &$imported ) {
 		$in_section = 0;
 
 		foreach ( $xml_fields as $field ) {
 			$f = self::fill_field( $field, $form_id );
 
-		    if ( is_array($f['default_value']) && in_array($f['type'], array(
-		        'text', 'email', 'url', 'textarea',
-		        'number','phone', 'date', 'time',
-		        'hidden', 'password', 'tag', 'image',
-		    )) ) {
-		        if ( count($f['default_value']) === 1 ) {
+			if ( is_array($f['default_value']) && in_array($f['type'], array(
+				'text', 'email', 'url', 'textarea',
+				'number','phone', 'date', 'time',
+				'hidden', 'password', 'tag', 'image',
+			)) ) {
+				if ( count($f['default_value']) === 1 ) {
 					$f['default_value'] = '[' . reset( $f['default_value'] ) . ']';
-		        } else {
-		            $f['default_value'] = reset($f['default_value']);
-		        }
-		    }
+				} else {
+					$f['default_value'] = reset($f['default_value']);
+				}
+			}
 
 			self::maybe_update_in_section_variable( $in_section, $f );
 			self::maybe_update_form_select( $f, $imported );
@@ -394,12 +394,12 @@ 
 	}
 
 	/**
-	* Switch the form_select on a repeating field or embedded form if it needs to be switched
-	*
-	* @since 2.0.16
-	* @param array $f
-	* @param array $imported
-	*/
+	 * Switch the form_select on a repeating field or embedded form if it needs to be switched
+	 *
+	 * @since 2.0.16
+	 * @param array $f
+	 * @param array $imported
+	 */
 	private static function maybe_update_form_select( &$f, $imported ) {
 		if ( ! isset( $imported['forms'] ) ) {
 			return;
@@ -451,13 +451,13 @@ 
 	}
 
 	/**
-	* Updates the custom style setting on import
-	* Convert the post slug to an ID
-	*
-	* @since 2.0.19
-	* @param array $form
-	*
-	*/
+	 * Updates the custom style setting on import
+	 * Convert the post slug to an ID
+	 *
+	 * @since 2.0.19
+	 * @param array $form
+	 *
+	 */
 	private static function update_custom_style_setting_on_import( &$form ) {
 		if ( ! isset( $form['options']['custom_style'] ) ) {
 			return;
@@ -511,16 +511,16 @@ 
 	}
 
 	public static function import_xml_views( $views, $imported ) {
-        $imported['posts'] = array();
-        $form_action_type = FrmFormActionsController::$action_post_type;
+		$imported['posts'] = array();
+		$form_action_type = FrmFormActionsController::$action_post_type;
 
-        $post_types = array(
-            'frm_display' => 'views',
-            $form_action_type => 'actions',
-            'frm_styles'    => 'styles',
-        );
+		$post_types = array(
+			'frm_display' => 'views',
+			$form_action_type => 'actions',
+			'frm_styles'    => 'styles',
+		);
 
-        foreach ( $views as $item ) {
+		foreach ( $views as $item ) {
 			$post = array(
 				'post_title'    => (string) $item->title,
 				'post_name'     => (string) $item->post_name,
@@ -539,52 +539,52 @@ 
 				'post_date'     => (string) $item->post_date,
 				'post_date_gmt' => (string) $item->post_date_gmt,
 				'ping_status'   => (string) $item->ping_status,
-                'postmeta'      => array(),
-                'tax_input'     => array(),
+				'postmeta'      => array(),
+				'tax_input'     => array(),
 			);
 
-            $old_id = $post['post_id'];
-            self::populate_post($post, $item, $imported);
+			$old_id = $post['post_id'];
+			self::populate_post($post, $item, $imported);
 
 			unset($item);
 
 			$post_id = false;
-            if ( $post['post_type'] == $form_action_type ) {
-                $action_control = FrmFormActionsController::get_form_actions( $post['post_excerpt'] );
+			if ( $post['post_type'] == $form_action_type ) {
+				$action_control = FrmFormActionsController::get_form_actions( $post['post_excerpt'] );
 				if ( $action_control && is_object( $action_control ) ) {
 					$post_id = $action_control->maybe_create_action( $post, $imported['form_status'] );
 				}
-                unset($action_control);
-            } else if ( $post['post_type'] == 'frm_styles' ) {
-                // Properly encode post content before inserting the post
-                $post['post_content'] = FrmAppHelper::maybe_json_decode( $post['post_content'] );
-                $post['post_content'] = FrmAppHelper::prepare_and_encode( $post['post_content'] );
-
-                // Create/update post now
-                $post_id = wp_insert_post( $post );
-            } else {
-                // Create/update post now
-                $post_id = wp_insert_post( $post );
-            }
-
-            if ( ! is_numeric($post_id) ) {
-                continue;
-            }
-
-            self::update_postmeta($post, $post_id);
-
-            $this_type = 'posts';
+				unset($action_control);
+			} else if ( $post['post_type'] == 'frm_styles' ) {
+				// Properly encode post content before inserting the post
+				$post['post_content'] = FrmAppHelper::maybe_json_decode( $post['post_content'] );
+				$post['post_content'] = FrmAppHelper::prepare_and_encode( $post['post_content'] );
+
+				// Create/update post now
+				$post_id = wp_insert_post( $post );
+			} else {
+				// Create/update post now
+				$post_id = wp_insert_post( $post );
+			}
+
+			if ( ! is_numeric($post_id) ) {
+				continue;
+			}
+
+			self::update_postmeta($post, $post_id);
+
+			$this_type = 'posts';
 			if ( isset( $post_types[ $post['post_type'] ] ) ) {
 				$this_type = $post_types[ $post['post_type'] ];
-            }
+			}
 
-            if ( isset($post['ID']) && $post_id == $post['ID'] ) {
-                $imported['updated'][ $this_type ]++;
-            } else {
-                $imported['imported'][ $this_type ]++;
-            }
+			if ( isset($post['ID']) && $post_id == $post['ID'] ) {
+				$imported['updated'][ $this_type ]++;
+			} else {
+				$imported['imported'][ $this_type ]++;
+			}
 
-            unset($post);
+			unset($post);
 
 			$imported['posts'][ (int) $old_id ] = $post_id;
 		}
@@ -592,16 +592,16 @@ 
 		self::maybe_update_stylesheet( $imported );
 
 		return $imported;
-    }
+	}
 
-    private static function populate_post( &$post, $item, $imported ) {
+	private static function populate_post( &$post, $item, $imported ) {
 		if ( isset($item->attachment_url) ) {
 			$post['attachment_url'] = (string) $item->attachment_url;
 		}
 
 		if ( $post['post_type'] == FrmFormActionsController::$action_post_type && isset( $imported['forms'][ (int) $post['menu_order'] ] ) ) {
-		    // update to new form id
-		    $post['menu_order'] = $imported['forms'][ (int) $post['menu_order'] ];
+			// update to new form id
+			$post['menu_order'] = $imported['forms'][ (int) $post['menu_order'] ];
 		}
 
 		// Don't allow default styles to take over a site's default style
@@ -610,144 +610,144 @@ 
 		}
 
 		foreach ( $item->postmeta as $meta ) {
-		    self::populate_postmeta($post, $meta, $imported);
+			self::populate_postmeta($post, $meta, $imported);
 			unset($meta);
 		}
 
-        self::populate_taxonomies($post, $item);
+		self::populate_taxonomies($post, $item);
 
-        self::maybe_editing_post($post);
-    }
+		self::maybe_editing_post($post);
+	}
 
-    private static function populate_postmeta( &$post, $meta, $imported ) {
-        global $frm_duplicate_ids;
+	private static function populate_postmeta( &$post, $meta, $imported ) {
+		global $frm_duplicate_ids;
 
-	    $m = array(
+		$m = array(
 			'key'   => (string) $meta->meta_key,
 			'value' => (string) $meta->meta_value,
 		);
 
 		//switch old form and field ids to new ones
 		if ( $m['key'] == 'frm_form_id' && isset($imported['forms'][ (int) $m['value'] ]) ) {
-		    $m['value'] = $imported['forms'][ (int) $m['value'] ];
+			$m['value'] = $imported['forms'][ (int) $m['value'] ];
 		} else {
-		    $m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
+			$m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
 
-		    if ( ! empty($frm_duplicate_ids) ) {
+			if ( ! empty($frm_duplicate_ids) ) {
 
-		        if ( $m['key'] == 'frm_dyncontent' ) {
-		            $m['value'] = FrmFieldsHelper::switch_field_ids($m['value']);
-    		    } else if ( $m['key'] == 'frm_options' ) {
+				if ( $m['key'] == 'frm_dyncontent' ) {
+					$m['value'] = FrmFieldsHelper::switch_field_ids($m['value']);
+				} else if ( $m['key'] == 'frm_options' ) {
 
 					foreach ( array( 'date_field_id', 'edate_field_id' ) as $setting_name ) {
 						if ( isset( $m['value'][ $setting_name ] ) && is_numeric( $m['value'][ $setting_name ] ) && isset( $frm_duplicate_ids[ $m['value'][ $setting_name ] ] ) ) {
 							$m['value'][ $setting_name ] = $frm_duplicate_ids[ $m['value'][ $setting_name ] ];
-    		            }
-    		        }
-
-                    $check_dup_array = array();
-    		        if ( isset( $m['value']['order_by'] ) && ! empty( $m['value']['order_by'] ) ) {
-    		            if ( is_numeric( $m['value']['order_by'] ) && isset( $frm_duplicate_ids[ $m['value']['order_by'] ] ) ) {
-    		                $m['value']['order_by'] = $frm_duplicate_ids[ $m['value']['order_by'] ];
-    		            } else if ( is_array( $m['value']['order_by'] ) ) {
-                            $check_dup_array[] = 'order_by';
-    		            }
-    		        }
-
-    		        if ( isset( $m['value']['where'] ) && ! empty( $m['value']['where'] ) ) {
-    		            $check_dup_array[] = 'where';
-    		        }
-
-                    foreach ( $check_dup_array as $check_k ) {
+						}
+					}
+
+					$check_dup_array = array();
+					if ( isset( $m['value']['order_by'] ) && ! empty( $m['value']['order_by'] ) ) {
+						if ( is_numeric( $m['value']['order_by'] ) && isset( $frm_duplicate_ids[ $m['value']['order_by'] ] ) ) {
+							$m['value']['order_by'] = $frm_duplicate_ids[ $m['value']['order_by'] ];
+						} else if ( is_array( $m['value']['order_by'] ) ) {
+							$check_dup_array[] = 'order_by';
+						}
+					}
+
+					if ( isset( $m['value']['where'] ) && ! empty( $m['value']['where'] ) ) {
+						$check_dup_array[] = 'where';
+					}
+
+					foreach ( $check_dup_array as $check_k ) {
 						foreach ( (array) $m['value'][ $check_k ] as $mk => $mv ) {
 							if ( isset( $frm_duplicate_ids[ $mv ] ) ) {
 								$m['value'][ $check_k ][ $mk ] = $frm_duplicate_ids[ $mv ];
-		                    }
-		                    unset($mk, $mv);
-		                }
-                    }
-    		    }
-		    }
+							}
+							unset($mk, $mv);
+						}
+					}
+				}
+			}
 		}
 
 		if ( ! is_array($m['value']) ) {
-		    $m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
+			$m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
 		}
 
 		$post['postmeta'][ (string) $meta->meta_key ] = $m['value'];
-    }
-
-    /**
-     * Add terms to post
-     * @param array $post by reference
-     * @param object $item The XML object data
-     */
-    private static function populate_taxonomies( &$post, $item ) {
+	}
+
+	/**
+	 * Add terms to post
+	 * @param array $post by reference
+	 * @param object $item The XML object data
+	 */
+	private static function populate_taxonomies( &$post, $item ) {
 		foreach ( $item->category as $c ) {
 			$att = $c->attributes();
 			if ( ! isset( $att['nicename'] ) ) {
-                continue;
-            }
-
-		    $taxonomy = (string) $att['domain'];
-		    if ( is_taxonomy_hierarchical($taxonomy) ) {
-		        $name = (string) $att['nicename'];
-		        $h_term = get_term_by('slug', $name, $taxonomy);
-		        if ( $h_term ) {
-		            $name = $h_term->term_id;
-		        }
-		        unset($h_term);
-		    } else {
-		        $name = (string) $c;
-		    }
+				continue;
+			}
+
+			$taxonomy = (string) $att['domain'];
+			if ( is_taxonomy_hierarchical($taxonomy) ) {
+				$name = (string) $att['nicename'];
+				$h_term = get_term_by('slug', $name, $taxonomy);
+				if ( $h_term ) {
+					$name = $h_term->term_id;
+				}
+				unset($h_term);
+			} else {
+				$name = (string) $c;
+			}
 
 			if ( ! isset( $post['tax_input'][ $taxonomy ] ) ) {
 				$post['tax_input'][ $taxonomy ] = array();
 			}
 
 			$post['tax_input'][ $taxonomy ][] = $name;
-		    unset($name);
+			unset($name);
 		}
-    }
+	}
 
-    /**
-     * Edit post if the key and created time match
-     */
-    private static function maybe_editing_post( &$post ) {
+	/**
+	 * Edit post if the key and created time match
+	 */
+	private static function maybe_editing_post( &$post ) {
 		$match_by = array(
-		    'post_type'     => $post['post_type'],
-		    'name'          => $post['post_name'],
-		    'post_status'   => $post['post_status'],
-		    'posts_per_page' => 1,
+			'post_type'     => $post['post_type'],
+			'name'          => $post['post_name'],
+			'post_status'   => $post['post_status'],
+			'posts_per_page' => 1,
 		);
 
 		if ( in_array( $post['post_status'], array( 'trash', 'draft' ) ) ) {
-		    $match_by['include'] = $post['post_id'];
-		    unset($match_by['name']);
+			$match_by['include'] = $post['post_id'];
+			unset($match_by['name']);
 		}
 
 		$editing = get_posts($match_by);
 
-        if ( ! empty($editing) && current($editing)->post_date == $post['post_date'] ) {
-            // set the id of the post to edit
-            $post['ID'] = current($editing)->ID;
-        }
-    }
+		if ( ! empty($editing) && current($editing)->post_date == $post['post_date'] ) {
+			// set the id of the post to edit
+			$post['ID'] = current($editing)->ID;
+		}
+	}
 
-    private static function update_postmeta( &$post, $post_id ) {
-        foreach ( $post['postmeta'] as $k => $v ) {
-            if ( '_edit_last' == $k ) {
-                $v = FrmAppHelper::get_user_id_param($v);
-            } else if ( '_thumbnail_id' == $k && FrmAppHelper::pro_is_installed() ) {
-                //change the attachment ID
-                $v = FrmProXMLHelper::get_file_id($v);
-            }
+	private static function update_postmeta( &$post, $post_id ) {
+		foreach ( $post['postmeta'] as $k => $v ) {
+			if ( '_edit_last' == $k ) {
+				$v = FrmAppHelper::get_user_id_param($v);
+			} else if ( '_thumbnail_id' == $k && FrmAppHelper::pro_is_installed() ) {
+				//change the attachment ID
+				$v = FrmProXMLHelper::get_file_id($v);
+			}
 
-            update_post_meta($post_id, $k, $v);
+			update_post_meta($post_id, $k, $v);
 
-            unset($k, $v);
-        }
-    }
+			unset($k, $v);
+		}
+	}
 
 	private static function maybe_update_stylesheet( $imported ) {
 		$new_styles = isset( $imported['imported']['styles'] ) && ! empty( $imported['imported']['styles'] );
@@ -763,72 +763,72 @@ 
 		}
 	}
 
-    /**
-     * @param string $message
-     */
+	/**
+	 * @param string $message
+	 */
 	public static function parse_message( $result, &$message, &$errors ) {
-        if ( is_wp_error($result) ) {
-            $errors[] = $result->get_error_message();
-        } else if ( ! $result ) {
-            return;
-        }
-
-        if ( ! is_array($result) ) {
-            $message = is_string( $result ) ? $result : print_r( $result, 1 );
-            return;
-        }
-
-        $t_strings = array(
-            'imported'  => __( 'Imported', 'formidable' ),
-            'updated'   => __( 'Updated', 'formidable' ),
-        );
-
-        $message = '<ul>';
-        foreach ( $result as $type => $results ) {
+		if ( is_wp_error($result) ) {
+			$errors[] = $result->get_error_message();
+		} else if ( ! $result ) {
+			return;
+		}
+
+		if ( ! is_array($result) ) {
+			$message = is_string( $result ) ? $result : print_r( $result, 1 );
+			return;
+		}
+
+		$t_strings = array(
+			'imported'  => __( 'Imported', 'formidable' ),
+			'updated'   => __( 'Updated', 'formidable' ),
+		);
+
+		$message = '<ul>';
+		foreach ( $result as $type => $results ) {
 			if ( ! isset( $t_strings[ $type ] ) ) {
-                // only print imported and updated
-                continue;
-            }
+				// only print imported and updated
+				continue;
+			}
 
-            $s_message = array();
-            foreach ( $results as $k => $m ) {
-                self::item_count_message($m, $k, $s_message);
-                unset($k, $m);
-            }
+			$s_message = array();
+			foreach ( $results as $k => $m ) {
+				self::item_count_message($m, $k, $s_message);
+				unset($k, $m);
+			}
 
-            if ( ! empty($s_message) ) {
+			if ( ! empty($s_message) ) {
 				$message .= '<li><strong>' . $t_strings[ $type ] . ':</strong> ';
-                $message .= implode(', ', $s_message);
-                $message .= '</li>';
-            }
-        }
-
-        if ( $message == '<ul>' ) {
-            $message = '';
-            $errors[] = __( 'Nothing was imported or updated', 'formidable' );
-        } else {
-            $message .= '</ul>';
-        }
-    }
+				$message .= implode(', ', $s_message);
+				$message .= '</li>';
+			}
+		}
+
+		if ( $message == '<ul>' ) {
+			$message = '';
+			$errors[] = __( 'Nothing was imported or updated', 'formidable' );
+		} else {
+			$message .= '</ul>';
+		}
+	}
 
 	public static function item_count_message( $m, $type, &$s_message ) {
-        if ( ! $m ) {
-            return;
-        }
-
-        $strings = array(
-            'forms'     => sprintf( _n( '%1$s Form', '%1$s Forms', $m, 'formidable' ), $m ),
-            'fields'    => sprintf( _n( '%1$s Field', '%1$s Fields', $m, 'formidable' ), $m ),
-            'items'     => sprintf( _n( '%1$s Entry', '%1$s Entries', $m, 'formidable' ), $m ),
-            'views'     => sprintf( _n( '%1$s View', '%1$s Views', $m, 'formidable' ), $m ),
-            'posts'     => sprintf( _n( '%1$s Post', '%1$s Posts', $m, 'formidable' ), $m ),
-            'styles'     => sprintf( _n( '%1$s Style', '%1$s Styles', $m, 'formidable' ), $m ),
-            'terms'     => sprintf( _n( '%1$s Term', '%1$s Terms', $m, 'formidable' ), $m ),
-            'actions'   => sprintf( _n( '%1$s Form Action', '%1$s Form Actions', $m, 'formidable' ), $m ),
-        );
+		if ( ! $m ) {
+			return;
+		}
+
+		$strings = array(
+			'forms'     => sprintf( _n( '%1$s Form', '%1$s Forms', $m, 'formidable' ), $m ),
+			'fields'    => sprintf( _n( '%1$s Field', '%1$s Fields', $m, 'formidable' ), $m ),
+			'items'     => sprintf( _n( '%1$s Entry', '%1$s Entries', $m, 'formidable' ), $m ),
+			'views'     => sprintf( _n( '%1$s View', '%1$s Views', $m, 'formidable' ), $m ),
+			'posts'     => sprintf( _n( '%1$s Post', '%1$s Posts', $m, 'formidable' ), $m ),
+			'styles'     => sprintf( _n( '%1$s Style', '%1$s Styles', $m, 'formidable' ), $m ),
+			'terms'     => sprintf( _n( '%1$s Term', '%1$s Terms', $m, 'formidable' ), $m ),
+			'actions'   => sprintf( _n( '%1$s Form Action', '%1$s Form Actions', $m, 'formidable' ), $m ),
+		);
 
 		$s_message[] = isset( $strings[ $type ] ) ? $strings[ $type ] : ' ' . $m . ' ' . ucfirst( $type );
-    }
+	}
 
 	/**
 	 * Prepare the form options for export
@@ -859,16 +859,16 @@ 
 	}
 
 	public static function cdata( $str ) {
-	    $str = maybe_unserialize($str);
-	    if ( is_array($str) ) {
-	        $str = json_encode($str);
+		$str = maybe_unserialize($str);
+		if ( is_array($str) ) {
+			$str = json_encode($str);
 		} else if ( seems_utf8( $str ) == false ) {
 			$str = utf8_encode( $str );
 		}
 
-        if ( is_numeric($str) ) {
-            return $str;
-        }
+		if ( is_numeric($str) ) {
+			return $str;
+		}
 
 		self::remove_invalid_characters_from_xml( $str );
 
@@ -889,58 +889,58 @@ 
 		$str = str_replace( '\x1F', '', $str );
 	}
 
-    public static function migrate_form_settings_to_actions( $form_options, $form_id, &$imported = array(), $switch = false ) {
-        // Get post type
-        $post_type = FrmFormActionsController::$action_post_type;
-
-        // Set up imported index, if not set up yet
-        if ( ! isset( $imported['imported']['actions'] ) ) {
-            $imported['imported']['actions'] = 0;
-        }
-
-        // Migrate post settings to action
-        self::migrate_post_settings_to_action( $form_options, $form_id, $post_type, $imported, $switch );
-
-        // Migrate email settings to action
-        self::migrate_email_settings_to_action( $form_options, $form_id, $post_type, $imported, $switch );
-    }
-
-    /**
-    * Migrate post settings to form action
-    *
-    * @param string $post_type
-    */
-    private static function migrate_post_settings_to_action( $form_options, $form_id, $post_type, &$imported, $switch ) {
-        if ( ! isset($form_options['create_post']) || ! $form_options['create_post'] ) {
-            return;
-        }
-
-        $new_action = array(
-            'post_type'     => $post_type,
-            'post_excerpt'  => 'wppost',
+	public static function migrate_form_settings_to_actions( $form_options, $form_id, &$imported = array(), $switch = false ) {
+		// Get post type
+		$post_type = FrmFormActionsController::$action_post_type;
+
+		// Set up imported index, if not set up yet
+		if ( ! isset( $imported['imported']['actions'] ) ) {
+			$imported['imported']['actions'] = 0;
+		}
+
+		// Migrate post settings to action
+		self::migrate_post_settings_to_action( $form_options, $form_id, $post_type, $imported, $switch );
+
+		// Migrate email settings to action
+		self::migrate_email_settings_to_action( $form_options, $form_id, $post_type, $imported, $switch );
+	}
+
+	/**
+	 * Migrate post settings to form action
+	 *
+	 * @param string $post_type
+	 */
+	private static function migrate_post_settings_to_action( $form_options, $form_id, $post_type, &$imported, $switch ) {
+		if ( ! isset($form_options['create_post']) || ! $form_options['create_post'] ) {
+			return;
+		}
+
+		$new_action = array(
+			'post_type'     => $post_type,
+			'post_excerpt'  => 'wppost',
 			'post_title'    => __( 'Create Posts', 'formidable' ),
-            'menu_order'    => $form_id,
-            'post_status'   => 'publish',
-            'post_content'  => array(),
+			'menu_order'    => $form_id,
+			'post_status'   => 'publish',
+			'post_content'  => array(),
 			'post_name'     => $form_id . '_wppost_1',
-        );
+		);
 
-        $post_settings = array(
-            'post_type', 'post_category', 'post_content',
-            'post_excerpt', 'post_title', 'post_name', 'post_date',
+		$post_settings = array(
+			'post_type', 'post_category', 'post_content',
+			'post_excerpt', 'post_title', 'post_name', 'post_date',
 			'post_status', 'post_custom_fields', 'post_password',
-        );
+		);
 
-        foreach ( $post_settings as $post_setting ) {
+		foreach ( $post_settings as $post_setting ) {
 			if ( isset( $form_options[ $post_setting ] ) ) {
 				$new_action['post_content'][ $post_setting ] = $form_options[ $post_setting ];
-            }
-            unset($post_setting);
-        }
+			}
+			unset($post_setting);
+		}
 
 		$new_action['event'] = array( 'create', 'update' );
 
-        if ( $switch ) {
+		if ( $switch ) {
 			// Fields with string or int saved
 			$basic_fields = array( 'post_title', 'post_content', 'post_excerpt', 'post_password', 'post_date', 'post_status' );
 
@@ -948,22 +948,22 @@ 
 			$array_fields = array( 'post_category', 'post_custom_fields' );
 
 			$new_action['post_content'] = self::switch_action_field_ids( $new_action['post_content'], $basic_fields, $array_fields );
-        }
-        $new_action['post_content'] = json_encode($new_action['post_content']);
+		}
+		$new_action['post_content'] = json_encode($new_action['post_content']);
 
-        $exists = get_posts( array(
-            'name'          => $new_action['post_name'],
-            'post_type'     => $new_action['post_type'],
-            'post_status'   => $new_action['post_status'],
-            'numberposts'   => 1,
-        ) );
+		$exists = get_posts( array(
+			'name'          => $new_action['post_name'],
+			'post_type'     => $new_action['post_type'],
+			'post_status'   => $new_action['post_status'],
+			'numberposts'   => 1,
+		) );
 
-        if ( ! $exists ) {
+		if ( ! $exists ) {
 			// this isn't an email, but we need to use a class that will always be included
 			FrmAppHelper::save_json_post( $new_action );
-            $imported['imported']['actions']++;
-        }
-    }
+			$imported['imported']['actions']++;
+		}
+	}
 
 	/**
 	 * Switch old field IDs for new field IDs in emails and post
@@ -976,211 +976,211 @@ 
 	 * @return string $post_content - new field IDs
 	 */
 	private static function switch_action_field_ids( $post_content, $basic_fields, $array_fields = array() ) {
-        global $frm_duplicate_ids;
+		global $frm_duplicate_ids;
 
-        // If there aren't IDs that were switched, end now
-        if ( ! $frm_duplicate_ids ) {
-            return;
-        }
+		// If there aren't IDs that were switched, end now
+		if ( ! $frm_duplicate_ids ) {
+			return;
+		}
 
-        // Get old IDs
-        $old = array_keys( $frm_duplicate_ids );
+		// Get old IDs
+		$old = array_keys( $frm_duplicate_ids );
 
-        // Get new IDs
-        $new = array_values( $frm_duplicate_ids );
+		// Get new IDs
+		$new = array_values( $frm_duplicate_ids );
 
-        // Do a str_replace with each item to set the new IDs
-        foreach ( $post_content as $key => $setting ) {
-            if ( ! is_array( $setting ) && in_array( $key, $basic_fields ) ) {
-                // Replace old IDs with new IDs
+		// Do a str_replace with each item to set the new IDs
+		foreach ( $post_content as $key => $setting ) {
+			if ( ! is_array( $setting ) && in_array( $key, $basic_fields ) ) {
+				// Replace old IDs with new IDs
 				$post_content[ $key ] = str_replace( $old, $new, $setting );
-            } else if ( is_array( $setting ) && in_array( $key, $array_fields ) ) {
-                foreach ( $setting as $k => $val ) {
-                    // Replace old IDs with new IDs
+			} else if ( is_array( $setting ) && in_array( $key, $array_fields ) ) {
+				foreach ( $setting as $k => $val ) {
+					// Replace old IDs with new IDs
 					$post_content[ $key ][ $k ] = str_replace( $old, $new, $val );
-                }
-            }
-            unset( $key, $setting );
-        }
-        return $post_content;
-    }
-
-    private static function migrate_email_settings_to_action( $form_options, $form_id, $post_type, &$imported, $switch ) {
-        // No old notifications or autoresponders to carry over
+				}
+			}
+			unset( $key, $setting );
+		}
+		return $post_content;
+	}
+
+	private static function migrate_email_settings_to_action( $form_options, $form_id, $post_type, &$imported, $switch ) {
+		// No old notifications or autoresponders to carry over
 		if ( ! isset( $form_options['auto_responder'] ) && ! isset( $form_options['notification'] ) && ! isset( $form_options['email_to'] ) ) {
-            return;
-        }
+			return;
+		}
 
-        // Initialize notifications array
-        $notifications = array();
+		// Initialize notifications array
+		$notifications = array();
 
-        // Migrate regular notifications
-        self::migrate_notifications_to_action( $form_options, $form_id, $notifications );
+		// Migrate regular notifications
+		self::migrate_notifications_to_action( $form_options, $form_id, $notifications );
 
-        // Migrate autoresponders
-        self::migrate_autoresponder_to_action( $form_options, $form_id, $notifications );
+		// Migrate autoresponders
+		self::migrate_autoresponder_to_action( $form_options, $form_id, $notifications );
 
-        if (  empty( $notifications ) ) {
-            return;
-        }
+		if (  empty( $notifications ) ) {
+			return;
+		}
 
-        foreach ( $notifications as $new_notification ) {
-            $new_notification['post_type']      = $post_type;
-            $new_notification['post_excerpt']   = 'email';
+		foreach ( $notifications as $new_notification ) {
+			$new_notification['post_type']      = $post_type;
+			$new_notification['post_excerpt']   = 'email';
 			$new_notification['post_title']     = __( 'Email Notification', 'formidable' );
-            $new_notification['menu_order']     = $form_id;
-            $new_notification['post_status']    = 'publish';
+			$new_notification['menu_order']     = $form_id;
+			$new_notification['post_status']    = 'publish';
 
-            // Switch field IDs and keys, if needed
-            if ( $switch ) {
+			// Switch field IDs and keys, if needed
+			if ( $switch ) {
 
 				// Switch field IDs in email conditional logic
 				self::switch_email_contition_field_ids( $new_notification['post_content'] );
 
 				// Switch all other field IDs in email
-                $new_notification['post_content'] = FrmFieldsHelper::switch_field_ids( $new_notification['post_content'] );
-            }
-            $new_notification['post_content']   = FrmAppHelper::prepare_and_encode( $new_notification['post_content'] );
-
-            $exists = get_posts( array(
-                'name'          => $new_notification['post_name'],
-                'post_type'     => $new_notification['post_type'],
-                'post_status'   => $new_notification['post_status'],
-                'numberposts'   => 1,
-            ) );
-
-            if ( empty($exists) ) {
+				$new_notification['post_content'] = FrmFieldsHelper::switch_field_ids( $new_notification['post_content'] );
+			}
+			$new_notification['post_content']   = FrmAppHelper::prepare_and_encode( $new_notification['post_content'] );
+
+			$exists = get_posts( array(
+				'name'          => $new_notification['post_name'],
+				'post_type'     => $new_notification['post_type'],
+				'post_status'   => $new_notification['post_status'],
+				'numberposts'   => 1,
+			) );
+
+			if ( empty($exists) ) {
 				FrmAppHelper::save_json_post( $new_notification );
-                $imported['imported']['actions']++;
-            }
-            unset($new_notification);
-        }
-    }
-
-    private static function migrate_notifications_to_action( $form_options, $form_id, &$notifications ) {
-        if ( ! isset( $form_options['notification'] ) && isset( $form_options['email_to'] ) && ! empty( $form_options['email_to'] ) ) {
-            // add old settings into notification array
+				$imported['imported']['actions']++;
+			}
+			unset($new_notification);
+		}
+	}
+
+	private static function migrate_notifications_to_action( $form_options, $form_id, &$notifications ) {
+		if ( ! isset( $form_options['notification'] ) && isset( $form_options['email_to'] ) && ! empty( $form_options['email_to'] ) ) {
+			// add old settings into notification array
 			$form_options['notification'] = array( 0 => $form_options );
-        } else if ( isset( $form_options['notification']['email_to'] ) ) {
-            // make sure it's in the correct format
+		} else if ( isset( $form_options['notification']['email_to'] ) ) {
+			// make sure it's in the correct format
 			$form_options['notification'] = array( 0 => $form_options['notification'] );
-        }
+		}
 
-        if ( isset( $form_options['notification'] ) && is_array($form_options['notification']) ) {
-            foreach ( $form_options['notification'] as $email_key => $notification ) {
+		if ( isset( $form_options['notification'] ) && is_array($form_options['notification']) ) {
+			foreach ( $form_options['notification'] as $email_key => $notification ) {
 
-                $atts = array( 'email_to' => '', 'reply_to' => '', 'reply_to_name' => '', 'event' => '', 'form_id' => $form_id, 'email_key' => $email_key );
+				$atts = array( 'email_to' => '', 'reply_to' => '', 'reply_to_name' => '', 'event' => '', 'form_id' => $form_id, 'email_key' => $email_key );
 
-                // Format the email data
-                self::format_email_data( $atts, $notification );
+				// Format the email data
+				self::format_email_data( $atts, $notification );
 
 				if ( isset( $notification['twilio'] ) && $notification['twilio'] ) {
 					do_action( 'frm_create_twilio_action', $atts, $notification );
 				}
 
-                // Setup the new notification
-                $new_notification = array();
-                self::setup_new_notification( $new_notification, $notification, $atts );
+				// Setup the new notification
+				$new_notification = array();
+				self::setup_new_notification( $new_notification, $notification, $atts );
 
-                $notifications[] = $new_notification;
-            }
-        }
-    }
+				$notifications[] = $new_notification;
+			}
+		}
+	}
 
-    private static function format_email_data( &$atts, $notification ) {
-        // Format email_to
-        self::format_email_to_data( $atts, $notification );
+	private static function format_email_data( &$atts, $notification ) {
+		// Format email_to
+		self::format_email_to_data( $atts, $notification );
 
-        // Format the reply to email and name
-        $reply_fields = array( 'reply_to' => '', 'reply_to_name' => '' );
-        foreach ( $reply_fields as $f => $val ) {
+		// Format the reply to email and name
+		$reply_fields = array( 'reply_to' => '', 'reply_to_name' => '' );
+		foreach ( $reply_fields as $f => $val ) {
 			if ( isset( $notification[ $f ] ) ) {
 				$atts[ $f ] = $notification[ $f ];
 				if ( 'custom' == $notification[ $f ] ) {
 					$atts[ $f ] = $notification[ 'cust_' . $f ];
 				} else if ( is_numeric( $atts[ $f ] ) && ! empty( $atts[ $f ] ) ) {
 					$atts[ $f ] = '[' . $atts[ $f ] . ']';
-                }
-            }
-            unset( $f, $val );
-        }
+				}
+			}
+			unset( $f, $val );
+		}
 
-        // Format event
+		// Format event
 		$atts['event'] = array( 'create' );
-        if ( isset( $notification['update_email'] ) && 1 == $notification['update_email'] ) {
-            $atts['event'][] = 'update';
-        } else if ( isset($notification['update_email']) && 2 == $notification['update_email'] ) {
+		if ( isset( $notification['update_email'] ) && 1 == $notification['update_email'] ) {
+			$atts['event'][] = 'update';
+		} else if ( isset($notification['update_email']) && 2 == $notification['update_email'] ) {
 			$atts['event'] = array( 'update' );
-        }
-    }
+		}
+	}
 
-    private static function format_email_to_data( &$atts, $notification ) {
-        if ( isset( $notification['email_to'] ) ) {
+	private static function format_email_to_data( &$atts, $notification ) {
+		if ( isset( $notification['email_to'] ) ) {
 			$atts['email_to'] = preg_split( '/ (,|;) /', $notification['email_to'] );
-        } else {
-            $atts['email_to'] = array();
-        }
+		} else {
+			$atts['email_to'] = array();
+		}
 
-        if ( isset( $notification['also_email_to'] ) ) {
-            $email_fields = (array) $notification['also_email_to'];
-            $atts['email_to'] = array_merge( $email_fields, $atts['email_to'] );
-            unset( $email_fields );
-        }
+		if ( isset( $notification['also_email_to'] ) ) {
+			$email_fields = (array) $notification['also_email_to'];
+			$atts['email_to'] = array_merge( $email_fields, $atts['email_to'] );
+			unset( $email_fields );
+		}
 
-        foreach ( $atts['email_to'] as $key => $email_field ) {
+		foreach ( $atts['email_to'] as $key => $email_field ) {
 
-            if ( is_numeric( $email_field ) ) {
+			if ( is_numeric( $email_field ) ) {
 				$atts['email_to'][ $key ] = '[' . $email_field . ']';
-            }
+			}
 
-            if ( strpos( $email_field, '|') ) {
-                $email_opt = explode( '|', $email_field );
-                if ( isset( $email_opt[0] ) ) {
+			if ( strpos( $email_field, '|') ) {
+				$email_opt = explode( '|', $email_field );
+				if ( isset( $email_opt[0] ) ) {
 					$atts['email_to'][ $key ] = '[' . $email_opt[0] . ' show=' . $email_opt[1] . ']';
-                }
-                unset( $email_opt );
-            }
-        }
-        $atts['email_to'] = implode(', ', $atts['email_to']);
-    }
-
-    private static function setup_new_notification( &$new_notification, $notification, $atts ) {
-        // Set up new notification
-        $new_notification = array(
-            'post_content'  => array(
-                'email_to'      => $atts['email_to'],
-                'event'         => $atts['event'],
-            ),
+				}
+				unset( $email_opt );
+			}
+		}
+		$atts['email_to'] = implode(', ', $atts['email_to']);
+	}
+
+	private static function setup_new_notification( &$new_notification, $notification, $atts ) {
+		// Set up new notification
+		$new_notification = array(
+			'post_content'  => array(
+				'email_to'      => $atts['email_to'],
+				'event'         => $atts['event'],
+			),
 			'post_name'         => $atts['form_id'] . '_email_' . $atts['email_key'],
-        );
+		);
 
-        // Add more fields to the new notification
-        $add_fields = array( 'email_message', 'email_subject', 'plain_text', 'inc_user_info', 'conditions' );
-        foreach ( $add_fields as $add_field ) {
+		// Add more fields to the new notification
+		$add_fields = array( 'email_message', 'email_subject', 'plain_text', 'inc_user_info', 'conditions' );
+		foreach ( $add_fields as $add_field ) {
 			if ( isset( $notification[ $add_field ] ) ) {
 				$new_notification['post_content'][ $add_field ] = $notification[ $add_field ];
-            } else if ( in_array( $add_field, array( 'plain_text', 'inc_user_info' ) ) ) {
+			} else if ( in_array( $add_field, array( 'plain_text', 'inc_user_info' ) ) ) {
 				$new_notification['post_content'][ $add_field ] = 0;
-            } else {
+			} else {
 				$new_notification['post_content'][ $add_field ] = '';
-            }
-            unset( $add_field );
-        }
+			}
+			unset( $add_field );
+		}
 
 		// Set reply to
 		$new_notification['post_content']['reply_to'] = $atts['reply_to'];
 
-        // Set from
+		// Set from
 		if ( ! empty( $atts['reply_to'] ) || ! empty( $atts['reply_to_name'] ) ) {
 			$new_notification['post_content']['from'] = ( empty( $atts['reply_to_name'] ) ? '[sitename]' : $atts['reply_to_name'] ) . ' <' . ( empty( $atts['reply_to'] ) ? '[admin_email]' : $atts['reply_to'] ) . '>';
-        }
-    }
+		}
+	}
 
 	/**
-	* Switch field IDs in pre-2.0 email conditional logic
-	*
-	* @param $post_content array, pass by reference
-	*/
+	 * Switch field IDs in pre-2.0 email conditional logic
+	 *
+	 * @param $post_content array, pass by reference
+	 */
 	private static function switch_email_contition_field_ids( &$post_content ) {
 		// Switch field IDs in conditional logic
 		if ( isset( $post_content['conditions'] ) && is_array( $post_content['conditions'] ) ) {
@@ -1193,36 +1193,36 @@ 
 		}
 	}
 
-    private static function migrate_autoresponder_to_action( $form_options, $form_id, &$notifications ) {
-        if ( isset($form_options['auto_responder']) && $form_options['auto_responder'] && isset($form_options['ar_email_message']) && $form_options['ar_email_message'] ) {
-            // migrate autoresponder
-
-            $email_field = isset($form_options['ar_email_to']) ? $form_options['ar_email_to'] : 0;
-            if ( strpos($email_field, '|') ) {
-                // data from entries field
-                $email_field = explode('|', $email_field);
-                if ( isset($email_field[1]) ) {
-                    $email_field = $email_field[1];
-                }
-            }
-            if ( is_numeric($email_field) && ! empty($email_field) ) {
+	private static function migrate_autoresponder_to_action( $form_options, $form_id, &$notifications ) {
+		if ( isset($form_options['auto_responder']) && $form_options['auto_responder'] && isset($form_options['ar_email_message']) && $form_options['ar_email_message'] ) {
+			// migrate autoresponder
+
+			$email_field = isset($form_options['ar_email_to']) ? $form_options['ar_email_to'] : 0;
+			if ( strpos($email_field, '|') ) {
+				// data from entries field
+				$email_field = explode('|', $email_field);
+				if ( isset($email_field[1]) ) {
+					$email_field = $email_field[1];
+				}
+			}
+			if ( is_numeric($email_field) && ! empty($email_field) ) {
 				$email_field = '[' . $email_field . ']';
-            }
-
-            $notification = $form_options;
-            $new_notification2 = array(
-                'post_content'  => array(
-                    'email_message' => $notification['ar_email_message'],
-                    'email_subject' => isset($notification['ar_email_subject']) ? $notification['ar_email_subject'] : '',
-                    'email_to'      => $email_field,
-                    'plain_text'    => isset($notification['ar_plain_text']) ? $notification['ar_plain_text'] : 0,
-                    'inc_user_info' => 0,
-                ),
+			}
+
+			$notification = $form_options;
+			$new_notification2 = array(
+				'post_content'  => array(
+					'email_message' => $notification['ar_email_message'],
+					'email_subject' => isset($notification['ar_email_subject']) ? $notification['ar_email_subject'] : '',
+					'email_to'      => $email_field,
+					'plain_text'    => isset($notification['ar_plain_text']) ? $notification['ar_plain_text'] : 0,
+					'inc_user_info' => 0,
+				),
 				'post_name'     => $form_id . '_email_' . count( $notifications ),
-            );
+			);
 
-            $reply_to = isset($notification['ar_reply_to']) ? $notification['ar_reply_to'] : '';
-            $reply_to_name = isset($notification['ar_reply_to_name']) ? $notification['ar_reply_to_name'] : '';
+			$reply_to = isset($notification['ar_reply_to']) ? $notification['ar_reply_to'] : '';
+			$reply_to_name = isset($notification['ar_reply_to_name']) ? $notification['ar_reply_to_name'] : '';
 
 			if ( ! empty( $reply_to ) ) {
 				$new_notification2['post_content']['reply_to'] = $reply_to;
@@ -1232,9 +1232,9 @@ 
 				$new_notification2['post_content']['from'] = ( empty( $reply_to_name ) ? '[sitename]' : $reply_to_name ) . ' <' . ( empty( $reply_to ) ? '[admin_email]' : $reply_to ) . '>';
 			}
 
-            $notifications[] = $new_notification2;
-            unset( $new_notification2 );
-        }
-    }
+			$notifications[] = $new_notification2;
+			unset( $new_notification2 );
+		}
+	}
 }
 

Spacing +151 added lines, -151 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -36,10 +36,10 @@ 
 			'terms'    => array(),
         );
 
-        unset($defaults);
+        unset( $defaults );
 
 		if ( ! defined( 'WP_IMPORTING' ) ) {
-            define('WP_IMPORTING', true);
+            define( 'WP_IMPORTING', true );
         }
 
 		if ( ! class_exists( 'DOMDocument' ) ) {
@@ -52,7 +52,7 @@ 
 			return new WP_Error( 'SimpleXML_parse_error', __( 'There was an error when reading this XML file', 'formidable' ), libxml_get_errors() );
 		}
 
-		if ( ! function_exists('simplexml_import_dom') ) {
+		if ( ! function_exists( 'simplexml_import_dom' ) ) {
 			return new WP_Error( 'SimpleXML_parse_error', __( 'Your server is missing the simplexml_import_dom function', 'formidable' ), libxml_get_errors() );
 		}
 
@@ -67,14 +67,14 @@ 
         // add terms, forms (form and field ids), posts (post ids), and entries to db, in that order
 		foreach ( array( 'term', 'form', 'view' ) as $item_type ) {
             // grab cats, tags, and terms, or forms or posts
-            if ( isset($xml->{$item_type} ) ) {
+            if ( isset( $xml->{$item_type} ) ) {
 				$function_name = 'import_xml_' . $item_type . 's';
 				$imported = self::$function_name( $xml->{$item_type}, $imported );
 				unset( $function_name, $xml->{$item_type} );
             }
         }
 
-	    $return = apply_filters('frm_importing_xml', $imported, $xml );
+	    $return = apply_filters( 'frm_importing_xml', $imported, $xml );
 
 	    return $return;
     }
@@ -91,11 +91,11 @@ 
                 'slug'          => (string) $t->term_slug,
                 'description'   => (string) $t->term_description,
 				'parent'        => empty( $parent ) ? 0 : $parent,
-            ));
+            ) );
 
 			if ( $term && is_array( $term ) ) {
-                $imported['imported']['terms']++;
-				$imported['terms'][ (int) $t->term_id ] = $term['term_id'];
+                $imported['imported']['terms'] ++;
+				$imported['terms'][(int) $t->term_id] = $term['term_id'];
             }
 
 			unset( $term, $t );
@@ -142,9 +142,9 @@ 
 			} else {
 				$form_id = FrmForm::create( $form );
 		        if ( $form_id ) {
-		            $imported['imported']['forms']++;
+		            $imported['imported']['forms'] ++;
 		            // Keep track of whether this specific form was updated or not
-					$imported['form_status'][ $form_id ] = 'imported';
+					$imported['form_status'][$form_id] = 'imported';
 					self::track_imported_child_forms( (int) $form_id, $form['parent_form_id'], $child_forms );
 		        }
 			}
@@ -156,14 +156,14 @@ 
 		    // Update field ids/keys to new ones
 			do_action( 'frm_after_duplicate_form', $form_id, $form, array( 'old_id' => $old_id ) );
 
-			$imported['forms'][ (int) $item->id ] = $form_id;
+			$imported['forms'][(int) $item->id] = $form_id;
 
             // Send pre 2.0 form options through function that creates actions
             self::migrate_form_settings_to_actions( $form['options'], $form_id, $imported, $switch = true );
 
 			do_action( 'frm_after_import_form', $form_id, $form );
 
-		    unset($form, $item);
+		    unset( $form, $item );
 		}
 
 		self::maybe_update_child_form_parent_id( $imported['forms'], $child_forms );
@@ -205,18 +205,18 @@ 
 	private static function update_form( $this_form, $form, &$imported ) {
 		$form_id = $this_form->id;
 		FrmForm::update( $form_id, $form );
-		$imported['updated']['forms']++;
+		$imported['updated']['forms'] ++;
 		// Keep track of whether this specific form was updated or not
-		$imported['form_status'][ $form_id ] = 'updated';
+		$imported['form_status'][$form_id] = 'updated';
 	}
 
 	private static function get_form_fields( $form_id ) {
 		$form_fields = FrmField::get_all_for_form( $form_id, '', 'exclude', 'exclude' );
 		$old_fields = array();
 		foreach ( $form_fields as $f ) {
-			$old_fields[ $f->id ] = $f;
-			$old_fields[ $f->field_key ] = $f->id;
-			unset($f);
+			$old_fields[$f->id] = $f;
+			$old_fields[$f->field_key] = $f->id;
+			unset( $f );
 		}
 		$form_fields = $old_fields;
 		return $form_fields;
@@ -247,7 +247,7 @@ 
 		$regular_forms = array();
 
 		foreach ( $forms as $form ) {
-			$parent_form_id = isset( $form->parent_form_id) ? (int) $form->parent_form_id : 0;
+			$parent_form_id = isset( $form->parent_form_id ) ? (int) $form->parent_form_id : 0;
 
 			if ( $parent_form_id ) {
 				$child_forms[] = $form;
@@ -269,7 +269,7 @@ 
 	*/
 	private static function track_imported_child_forms( $form_id, $parent_form_id, &$child_forms ) {
 		if ( $parent_form_id ) {
-			$child_forms[ $form_id ] = $parent_form_id;
+			$child_forms[$form_id] = $parent_form_id;
 		}
 	}
 
@@ -284,9 +284,9 @@ 
 	private static function maybe_update_child_form_parent_id( $imported_forms, $child_forms ) {
 		foreach ( $child_forms as $child_form_id => $old_parent_form_id ) {
 
-			if ( isset( $imported_forms[ $old_parent_form_id ] ) && $imported_forms[ $old_parent_form_id ] != $old_parent_form_id ) {
+			if ( isset( $imported_forms[$old_parent_form_id] ) && $imported_forms[$old_parent_form_id] != $old_parent_form_id ) {
 				// Update all children with this old parent_form_id
-				$new_parent_form_id = (int) $imported_forms[ $old_parent_form_id ];
+				$new_parent_form_id = (int) $imported_forms[$old_parent_form_id];
 
 				FrmForm::update( $child_form_id, array( 'parent_form_id' => $new_parent_form_id ) );
 			}
@@ -305,15 +305,15 @@ 
 		foreach ( $xml_fields as $field ) {
 			$f = self::fill_field( $field, $form_id );
 
-		    if ( is_array($f['default_value']) && in_array($f['type'], array(
+		    if ( is_array( $f['default_value'] ) && in_array( $f['type'], array(
 		        'text', 'email', 'url', 'textarea',
-		        'number','phone', 'date', 'time',
+		        'number', 'phone', 'date', 'time',
 		        'hidden', 'password', 'tag', 'image',
-		    )) ) {
-		        if ( count($f['default_value']) === 1 ) {
+		    ) ) ) {
+		        if ( count( $f['default_value'] ) === 1 ) {
 					$f['default_value'] = '[' . reset( $f['default_value'] ) . ']';
 		        } else {
-		            $f['default_value'] = reset($f['default_value']);
+		            $f['default_value'] = reset( $f['default_value'] );
 		        }
 		    }
 
@@ -321,27 +321,27 @@ 
 			self::maybe_update_form_select( $f, $imported );
 			self::maybe_update_get_values_form_setting( $imported, $f );
 
-			if ( ! empty($this_form) ) {
+			if ( ! empty( $this_form ) ) {
 				// check for field to edit by field id
-				if ( isset( $form_fields[ $f['id'] ] ) ) {
+				if ( isset( $form_fields[$f['id']] ) ) {
 					FrmField::update( $f['id'], $f );
-					$imported['updated']['fields']++;
+					$imported['updated']['fields'] ++;
 
-					unset( $form_fields[ $f['id'] ] );
+					unset( $form_fields[$f['id']] );
 
 					//unset old field key
-					if ( isset( $form_fields[ $f['field_key'] ] ) ) {
-						unset( $form_fields[ $f['field_key'] ] );
+					if ( isset( $form_fields[$f['field_key']] ) ) {
+						unset( $form_fields[$f['field_key']] );
 					}
-				} else if ( isset( $form_fields[ $f['field_key'] ] ) ) {
+				} else if ( isset( $form_fields[$f['field_key']] ) ) {
 					// check for field to edit by field key
-					unset($f['id']);
+					unset( $f['id'] );
 
-					FrmField::update( $form_fields[ $f['field_key'] ], $f );
-					$imported['updated']['fields']++;
+					FrmField::update( $form_fields[$f['field_key']], $f );
+					$imported['updated']['fields'] ++;
 
-					unset( $form_fields[ $form_fields[ $f['field_key'] ] ] ); //unset old field id
-					unset( $form_fields[ $f['field_key'] ] ); //unset old field key
+					unset( $form_fields[$form_fields[$f['field_key']]] ); //unset old field id
+					unset( $form_fields[$f['field_key']] ); //unset old field key
 				} else {
 					// if no matching field id or key in this form, create the field
 					self::create_imported_field( $f, $imported );
@@ -360,11 +360,11 @@ 
 			'name'          => (string) $field->name,
 			'description'   => (string) $field->description,
 			'type'          => (string) $field->type,
-			'default_value' => FrmAppHelper::maybe_json_decode( (string) $field->default_value),
+			'default_value' => FrmAppHelper::maybe_json_decode( (string) $field->default_value ),
 			'field_order'   => (int) $field->field_order,
 			'form_id'       => (int) $form_id,
 			'required'      => (int) $field->required,
-			'options'       => FrmAppHelper::maybe_json_decode( (string) $field->options),
+			'options'       => FrmAppHelper::maybe_json_decode( (string) $field->options ),
 			'field_options' => FrmAppHelper::maybe_json_decode( (string) $field->field_options ),
 		);
 	}
@@ -408,8 +408,8 @@ 
 		if ( $f['type'] == 'form' || ( $f['type'] == 'divider' && FrmField::is_option_true( $f['field_options'], 'repeat' ) ) ) {
 			if ( FrmField::is_option_true( $f['field_options'], 'form_select' ) ) {
 				$form_select = $f['field_options']['form_select'];
-				if ( isset( $imported['forms'][ $form_select ] ) ) {
-					$f['field_options']['form_select'] = $imported['forms'][ $form_select ];
+				if ( isset( $imported['forms'][$form_select] ) ) {
+					$f['field_options']['form_select'] = $imported['forms'][$form_select];
 				}
 			}
 		}
@@ -429,8 +429,8 @@ 
 
 		if ( FrmField::is_option_true_in_array( $f['field_options'], 'get_values_form' ) ) {
 			$old_form = $f['field_options']['get_values_form'];
-			if ( isset( $imported['forms'][ $old_form ] ) ) {
-				$f['field_options']['get_values_form'] = $imported['forms'][ $old_form ];
+			if ( isset( $imported['forms'][$old_form] ) ) {
+				$f['field_options']['get_values_form'] = $imported['forms'][$old_form];
 			}
 		}
 	}
@@ -445,7 +445,7 @@ 
 	private static function create_imported_field( $f, &$imported ) {
 		$new_id = FrmField::create( $f );
 		if ( $new_id != false ) {
-			$imported['imported']['fields']++;
+			$imported['imported']['fields'] ++;
 			do_action( 'frm_after_field_is_imported', $f, $new_id );
 		}
 	}
@@ -544,9 +544,9 @@ 
 			);
 
             $old_id = $post['post_id'];
-            self::populate_post($post, $item, $imported);
+            self::populate_post( $post, $item, $imported );
 
-			unset($item);
+			unset( $item );
 
 			$post_id = false;
             if ( $post['post_type'] == $form_action_type ) {
@@ -554,7 +554,7 @@ 
 				if ( $action_control && is_object( $action_control ) ) {
 					$post_id = $action_control->maybe_create_action( $post, $imported['form_status'] );
 				}
-                unset($action_control);
+                unset( $action_control );
             } else if ( $post['post_type'] == 'frm_styles' ) {
                 // Properly encode post content before inserting the post
                 $post['post_content'] = FrmAppHelper::maybe_json_decode( $post['post_content'] );
@@ -567,26 +567,26 @@ 
                 $post_id = wp_insert_post( $post );
             }
 
-            if ( ! is_numeric($post_id) ) {
+            if ( ! is_numeric( $post_id ) ) {
                 continue;
             }
 
-            self::update_postmeta($post, $post_id);
+            self::update_postmeta( $post, $post_id );
 
             $this_type = 'posts';
-			if ( isset( $post_types[ $post['post_type'] ] ) ) {
-				$this_type = $post_types[ $post['post_type'] ];
+			if ( isset( $post_types[$post['post_type']] ) ) {
+				$this_type = $post_types[$post['post_type']];
             }
 
-            if ( isset($post['ID']) && $post_id == $post['ID'] ) {
-                $imported['updated'][ $this_type ]++;
+            if ( isset( $post['ID'] ) && $post_id == $post['ID'] ) {
+                $imported['updated'][$this_type] ++;
             } else {
-                $imported['imported'][ $this_type ]++;
+                $imported['imported'][$this_type] ++;
             }
 
-            unset($post);
+            unset( $post );
 
-			$imported['posts'][ (int) $old_id ] = $post_id;
+			$imported['posts'][(int) $old_id] = $post_id;
 		}
 
 		self::maybe_update_stylesheet( $imported );
@@ -595,13 +595,13 @@ 
     }
 
     private static function populate_post( &$post, $item, $imported ) {
-		if ( isset($item->attachment_url) ) {
+		if ( isset( $item->attachment_url ) ) {
 			$post['attachment_url'] = (string) $item->attachment_url;
 		}
 
-		if ( $post['post_type'] == FrmFormActionsController::$action_post_type && isset( $imported['forms'][ (int) $post['menu_order'] ] ) ) {
+		if ( $post['post_type'] == FrmFormActionsController::$action_post_type && isset( $imported['forms'][(int) $post['menu_order']] ) ) {
 		    // update to new form id
-		    $post['menu_order'] = $imported['forms'][ (int) $post['menu_order'] ];
+		    $post['menu_order'] = $imported['forms'][(int) $post['menu_order']];
 		}
 
 		// Don't allow default styles to take over a site's default style
@@ -610,13 +610,13 @@ 
 		}
 
 		foreach ( $item->postmeta as $meta ) {
-		    self::populate_postmeta($post, $meta, $imported);
-			unset($meta);
+		    self::populate_postmeta( $post, $meta, $imported );
+			unset( $meta );
 		}
 
-        self::populate_taxonomies($post, $item);
+        self::populate_taxonomies( $post, $item );
 
-        self::maybe_editing_post($post);
+        self::maybe_editing_post( $post );
     }
 
     private static function populate_postmeta( &$post, $meta, $imported ) {
@@ -628,27 +628,27 @@ 
 		);
 
 		//switch old form and field ids to new ones
-		if ( $m['key'] == 'frm_form_id' && isset($imported['forms'][ (int) $m['value'] ]) ) {
-		    $m['value'] = $imported['forms'][ (int) $m['value'] ];
+		if ( $m['key'] == 'frm_form_id' && isset( $imported['forms'][(int) $m['value']] ) ) {
+		    $m['value'] = $imported['forms'][(int) $m['value']];
 		} else {
-		    $m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
+		    $m['value'] = FrmAppHelper::maybe_json_decode( $m['value'] );
 
-		    if ( ! empty($frm_duplicate_ids) ) {
+		    if ( ! empty( $frm_duplicate_ids ) ) {
 
 		        if ( $m['key'] == 'frm_dyncontent' ) {
-		            $m['value'] = FrmFieldsHelper::switch_field_ids($m['value']);
+		            $m['value'] = FrmFieldsHelper::switch_field_ids( $m['value'] );
     		    } else if ( $m['key'] == 'frm_options' ) {
 
 					foreach ( array( 'date_field_id', 'edate_field_id' ) as $setting_name ) {
-						if ( isset( $m['value'][ $setting_name ] ) && is_numeric( $m['value'][ $setting_name ] ) && isset( $frm_duplicate_ids[ $m['value'][ $setting_name ] ] ) ) {
-							$m['value'][ $setting_name ] = $frm_duplicate_ids[ $m['value'][ $setting_name ] ];
+						if ( isset( $m['value'][$setting_name] ) && is_numeric( $m['value'][$setting_name] ) && isset( $frm_duplicate_ids[$m['value'][$setting_name]] ) ) {
+							$m['value'][$setting_name] = $frm_duplicate_ids[$m['value'][$setting_name]];
     		            }
     		        }
 
                     $check_dup_array = array();
     		        if ( isset( $m['value']['order_by'] ) && ! empty( $m['value']['order_by'] ) ) {
-    		            if ( is_numeric( $m['value']['order_by'] ) && isset( $frm_duplicate_ids[ $m['value']['order_by'] ] ) ) {
-    		                $m['value']['order_by'] = $frm_duplicate_ids[ $m['value']['order_by'] ];
+    		            if ( is_numeric( $m['value']['order_by'] ) && isset( $frm_duplicate_ids[$m['value']['order_by']] ) ) {
+    		                $m['value']['order_by'] = $frm_duplicate_ids[$m['value']['order_by']];
     		            } else if ( is_array( $m['value']['order_by'] ) ) {
                             $check_dup_array[] = 'order_by';
     		            }
@@ -659,22 +659,22 @@ 
     		        }
 
                     foreach ( $check_dup_array as $check_k ) {
-						foreach ( (array) $m['value'][ $check_k ] as $mk => $mv ) {
-							if ( isset( $frm_duplicate_ids[ $mv ] ) ) {
-								$m['value'][ $check_k ][ $mk ] = $frm_duplicate_ids[ $mv ];
+						foreach ( (array) $m['value'][$check_k] as $mk => $mv ) {
+							if ( isset( $frm_duplicate_ids[$mv] ) ) {
+								$m['value'][$check_k][$mk] = $frm_duplicate_ids[$mv];
 		                    }
-		                    unset($mk, $mv);
+		                    unset( $mk, $mv );
 		                }
                     }
     		    }
 		    }
 		}
 
-		if ( ! is_array($m['value']) ) {
-		    $m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
+		if ( ! is_array( $m['value'] ) ) {
+		    $m['value'] = FrmAppHelper::maybe_json_decode( $m['value'] );
 		}
 
-		$post['postmeta'][ (string) $meta->meta_key ] = $m['value'];
+		$post['postmeta'][(string) $meta->meta_key] = $m['value'];
     }
 
     /**
@@ -690,23 +690,23 @@ 
             }
 
 		    $taxonomy = (string) $att['domain'];
-		    if ( is_taxonomy_hierarchical($taxonomy) ) {
+		    if ( is_taxonomy_hierarchical( $taxonomy ) ) {
 		        $name = (string) $att['nicename'];
-		        $h_term = get_term_by('slug', $name, $taxonomy);
+		        $h_term = get_term_by( 'slug', $name, $taxonomy );
 		        if ( $h_term ) {
 		            $name = $h_term->term_id;
 		        }
-		        unset($h_term);
+		        unset( $h_term );
 		    } else {
 		        $name = (string) $c;
 		    }
 
-			if ( ! isset( $post['tax_input'][ $taxonomy ] ) ) {
-				$post['tax_input'][ $taxonomy ] = array();
+			if ( ! isset( $post['tax_input'][$taxonomy] ) ) {
+				$post['tax_input'][$taxonomy] = array();
 			}
 
-			$post['tax_input'][ $taxonomy ][] = $name;
-		    unset($name);
+			$post['tax_input'][$taxonomy][] = $name;
+		    unset( $name );
 		}
     }
 
@@ -723,29 +723,29 @@ 
 
 		if ( in_array( $post['post_status'], array( 'trash', 'draft' ) ) ) {
 		    $match_by['include'] = $post['post_id'];
-		    unset($match_by['name']);
+		    unset( $match_by['name'] );
 		}
 
-		$editing = get_posts($match_by);
+		$editing = get_posts( $match_by );
 
-        if ( ! empty($editing) && current($editing)->post_date == $post['post_date'] ) {
+        if ( ! empty( $editing ) && current( $editing )->post_date == $post['post_date'] ) {
             // set the id of the post to edit
-            $post['ID'] = current($editing)->ID;
+            $post['ID'] = current( $editing )->ID;
         }
     }
 
     private static function update_postmeta( &$post, $post_id ) {
         foreach ( $post['postmeta'] as $k => $v ) {
             if ( '_edit_last' == $k ) {
-                $v = FrmAppHelper::get_user_id_param($v);
+                $v = FrmAppHelper::get_user_id_param( $v );
             } else if ( '_thumbnail_id' == $k && FrmAppHelper::pro_is_installed() ) {
                 //change the attachment ID
-                $v = FrmProXMLHelper::get_file_id($v);
+                $v = FrmProXMLHelper::get_file_id( $v );
             }
 
-            update_post_meta($post_id, $k, $v);
+            update_post_meta( $post_id, $k, $v );
 
-            unset($k, $v);
+            unset( $k, $v );
         }
     }
 
@@ -767,13 +767,13 @@ 
      * @param string $message
      */
 	public static function parse_message( $result, &$message, &$errors ) {
-        if ( is_wp_error($result) ) {
+        if ( is_wp_error( $result ) ) {
             $errors[] = $result->get_error_message();
         } else if ( ! $result ) {
             return;
         }
 
-        if ( ! is_array($result) ) {
+        if ( ! is_array( $result ) ) {
             $message = is_string( $result ) ? $result : print_r( $result, 1 );
             return;
         }
@@ -785,20 +785,20 @@ 
 
         $message = '<ul>';
         foreach ( $result as $type => $results ) {
-			if ( ! isset( $t_strings[ $type ] ) ) {
+			if ( ! isset( $t_strings[$type] ) ) {
                 // only print imported and updated
                 continue;
             }
 
             $s_message = array();
             foreach ( $results as $k => $m ) {
-                self::item_count_message($m, $k, $s_message);
-                unset($k, $m);
+                self::item_count_message( $m, $k, $s_message );
+                unset( $k, $m );
             }
 
-            if ( ! empty($s_message) ) {
-				$message .= '<li><strong>' . $t_strings[ $type ] . ':</strong> ';
-                $message .= implode(', ', $s_message);
+            if ( ! empty( $s_message ) ) {
+				$message .= '<li><strong>' . $t_strings[$type] . ':</strong> ';
+                $message .= implode( ', ', $s_message );
                 $message .= '</li>';
             }
         }
@@ -827,7 +827,7 @@ 
             'actions'   => sprintf( _n( '%1$s Form Action', '%1$s Form Actions', $m, 'formidable' ), $m ),
         );
 
-		$s_message[] = isset( $strings[ $type ] ) ? $strings[ $type ] : ' ' . $m . ' ' . ucfirst( $type );
+		$s_message[] = isset( $strings[$type] ) ? $strings[$type] : ' ' . $m . ' ' . ucfirst( $type );
     }
 
 	/**
@@ -859,14 +859,14 @@ 
 	}
 
 	public static function cdata( $str ) {
-	    $str = maybe_unserialize($str);
-	    if ( is_array($str) ) {
-	        $str = json_encode($str);
+	    $str = maybe_unserialize( $str );
+	    if ( is_array( $str ) ) {
+	        $str = json_encode( $str );
 		} else if ( seems_utf8( $str ) == false ) {
 			$str = utf8_encode( $str );
 		}
 
-        if ( is_numeric($str) ) {
+        if ( is_numeric( $str ) ) {
             return $str;
         }
 
@@ -911,7 +911,7 @@ 
     * @param string $post_type
     */
     private static function migrate_post_settings_to_action( $form_options, $form_id, $post_type, &$imported, $switch ) {
-        if ( ! isset($form_options['create_post']) || ! $form_options['create_post'] ) {
+        if ( ! isset( $form_options['create_post'] ) || ! $form_options['create_post'] ) {
             return;
         }
 
@@ -932,10 +932,10 @@ 
         );
 
         foreach ( $post_settings as $post_setting ) {
-			if ( isset( $form_options[ $post_setting ] ) ) {
-				$new_action['post_content'][ $post_setting ] = $form_options[ $post_setting ];
+			if ( isset( $form_options[$post_setting] ) ) {
+				$new_action['post_content'][$post_setting] = $form_options[$post_setting];
             }
-            unset($post_setting);
+            unset( $post_setting );
         }
 
 		$new_action['event'] = array( 'create', 'update' );
@@ -949,7 +949,7 @@ 
 
 			$new_action['post_content'] = self::switch_action_field_ids( $new_action['post_content'], $basic_fields, $array_fields );
         }
-        $new_action['post_content'] = json_encode($new_action['post_content']);
+        $new_action['post_content'] = json_encode( $new_action['post_content'] );
 
         $exists = get_posts( array(
             'name'          => $new_action['post_name'],
@@ -961,7 +961,7 @@ 
         if ( ! $exists ) {
 			// this isn't an email, but we need to use a class that will always be included
 			FrmAppHelper::save_json_post( $new_action );
-            $imported['imported']['actions']++;
+            $imported['imported']['actions'] ++;
         }
     }
 
@@ -993,11 +993,11 @@ 
         foreach ( $post_content as $key => $setting ) {
             if ( ! is_array( $setting ) && in_array( $key, $basic_fields ) ) {
                 // Replace old IDs with new IDs
-				$post_content[ $key ] = str_replace( $old, $new, $setting );
+				$post_content[$key] = str_replace( $old, $new, $setting );
             } else if ( is_array( $setting ) && in_array( $key, $array_fields ) ) {
                 foreach ( $setting as $k => $val ) {
                     // Replace old IDs with new IDs
-					$post_content[ $key ][ $k ] = str_replace( $old, $new, $val );
+					$post_content[$key][$k] = str_replace( $old, $new, $val );
                 }
             }
             unset( $key, $setting );
@@ -1020,14 +1020,14 @@ 
         // Migrate autoresponders
         self::migrate_autoresponder_to_action( $form_options, $form_id, $notifications );
 
-        if (  empty( $notifications ) ) {
+        if ( empty( $notifications ) ) {
             return;
         }
 
         foreach ( $notifications as $new_notification ) {
             $new_notification['post_type']      = $post_type;
             $new_notification['post_excerpt']   = 'email';
-			$new_notification['post_title']     = __( 'Email Notification', 'formidable' );
+			$new_notification['post_title'] = __( 'Email Notification', 'formidable' );
             $new_notification['menu_order']     = $form_id;
             $new_notification['post_status']    = 'publish';
 
@@ -1040,7 +1040,7 @@ 
 				// Switch all other field IDs in email
                 $new_notification['post_content'] = FrmFieldsHelper::switch_field_ids( $new_notification['post_content'] );
             }
-            $new_notification['post_content']   = FrmAppHelper::prepare_and_encode( $new_notification['post_content'] );
+            $new_notification['post_content'] = FrmAppHelper::prepare_and_encode( $new_notification['post_content'] );
 
             $exists = get_posts( array(
                 'name'          => $new_notification['post_name'],
@@ -1049,11 +1049,11 @@ 
                 'numberposts'   => 1,
             ) );
 
-            if ( empty($exists) ) {
+            if ( empty( $exists ) ) {
 				FrmAppHelper::save_json_post( $new_notification );
-                $imported['imported']['actions']++;
+                $imported['imported']['actions'] ++;
             }
-            unset($new_notification);
+            unset( $new_notification );
         }
     }
 
@@ -1066,7 +1066,7 @@ 
 			$form_options['notification'] = array( 0 => $form_options['notification'] );
         }
 
-        if ( isset( $form_options['notification'] ) && is_array($form_options['notification']) ) {
+        if ( isset( $form_options['notification'] ) && is_array( $form_options['notification'] ) ) {
             foreach ( $form_options['notification'] as $email_key => $notification ) {
 
                 $atts = array( 'email_to' => '', 'reply_to' => '', 'reply_to_name' => '', 'event' => '', 'form_id' => $form_id, 'email_key' => $email_key );
@@ -1094,12 +1094,12 @@ 
         // Format the reply to email and name
         $reply_fields = array( 'reply_to' => '', 'reply_to_name' => '' );
         foreach ( $reply_fields as $f => $val ) {
-			if ( isset( $notification[ $f ] ) ) {
-				$atts[ $f ] = $notification[ $f ];
-				if ( 'custom' == $notification[ $f ] ) {
-					$atts[ $f ] = $notification[ 'cust_' . $f ];
-				} else if ( is_numeric( $atts[ $f ] ) && ! empty( $atts[ $f ] ) ) {
-					$atts[ $f ] = '[' . $atts[ $f ] . ']';
+			if ( isset( $notification[$f] ) ) {
+				$atts[$f] = $notification[$f];
+				if ( 'custom' == $notification[$f] ) {
+					$atts[$f] = $notification['cust_' . $f];
+				} else if ( is_numeric( $atts[$f] ) && ! empty( $atts[$f] ) ) {
+					$atts[$f] = '[' . $atts[$f] . ']';
                 }
             }
             unset( $f, $val );
@@ -1109,7 +1109,7 @@ 
 		$atts['event'] = array( 'create' );
         if ( isset( $notification['update_email'] ) && 1 == $notification['update_email'] ) {
             $atts['event'][] = 'update';
-        } else if ( isset($notification['update_email']) && 2 == $notification['update_email'] ) {
+        } else if ( isset( $notification['update_email'] ) && 2 == $notification['update_email'] ) {
 			$atts['event'] = array( 'update' );
         }
     }
@@ -1130,18 +1130,18 @@ 
         foreach ( $atts['email_to'] as $key => $email_field ) {
 
             if ( is_numeric( $email_field ) ) {
-				$atts['email_to'][ $key ] = '[' . $email_field . ']';
+				$atts['email_to'][$key] = '[' . $email_field . ']';
             }
 
-            if ( strpos( $email_field, '|') ) {
+            if ( strpos( $email_field, '|' ) ) {
                 $email_opt = explode( '|', $email_field );
                 if ( isset( $email_opt[0] ) ) {
-					$atts['email_to'][ $key ] = '[' . $email_opt[0] . ' show=' . $email_opt[1] . ']';
+					$atts['email_to'][$key] = '[' . $email_opt[0] . ' show=' . $email_opt[1] . ']';
                 }
                 unset( $email_opt );
             }
         }
-        $atts['email_to'] = implode(', ', $atts['email_to']);
+        $atts['email_to'] = implode( ', ', $atts['email_to'] );
     }
 
     private static function setup_new_notification( &$new_notification, $notification, $atts ) {
@@ -1157,12 +1157,12 @@ 
         // Add more fields to the new notification
         $add_fields = array( 'email_message', 'email_subject', 'plain_text', 'inc_user_info', 'conditions' );
         foreach ( $add_fields as $add_field ) {
-			if ( isset( $notification[ $add_field ] ) ) {
-				$new_notification['post_content'][ $add_field ] = $notification[ $add_field ];
+			if ( isset( $notification[$add_field] ) ) {
+				$new_notification['post_content'][$add_field] = $notification[$add_field];
             } else if ( in_array( $add_field, array( 'plain_text', 'inc_user_info' ) ) ) {
-				$new_notification['post_content'][ $add_field ] = 0;
+				$new_notification['post_content'][$add_field] = 0;
             } else {
-				$new_notification['post_content'][ $add_field ] = '';
+				$new_notification['post_content'][$add_field] = '';
             }
             unset( $add_field );
         }
@@ -1186,26 +1186,26 @@ 
 		if ( isset( $post_content['conditions'] ) && is_array( $post_content['conditions'] ) ) {
 			foreach ( $post_content['conditions'] as $email_key => $val ) {
 				if ( is_numeric( $email_key ) ) {
-					$post_content['conditions'][ $email_key ] = self::switch_action_field_ids( $val, array( 'hide_field' ) );
+					$post_content['conditions'][$email_key] = self::switch_action_field_ids( $val, array( 'hide_field' ) );
 				}
-				unset( $email_key, $val);
+				unset( $email_key, $val );
 			}
 		}
 	}
 
     private static function migrate_autoresponder_to_action( $form_options, $form_id, &$notifications ) {
-        if ( isset($form_options['auto_responder']) && $form_options['auto_responder'] && isset($form_options['ar_email_message']) && $form_options['ar_email_message'] ) {
+        if ( isset( $form_options['auto_responder'] ) && $form_options['auto_responder'] && isset( $form_options['ar_email_message'] ) && $form_options['ar_email_message'] ) {
             // migrate autoresponder
 
-            $email_field = isset($form_options['ar_email_to']) ? $form_options['ar_email_to'] : 0;
-            if ( strpos($email_field, '|') ) {
+            $email_field = isset( $form_options['ar_email_to'] ) ? $form_options['ar_email_to'] : 0;
+            if ( strpos( $email_field, '|' ) ) {
                 // data from entries field
-                $email_field = explode('|', $email_field);
-                if ( isset($email_field[1]) ) {
+                $email_field = explode( '|', $email_field );
+                if ( isset( $email_field[1] ) ) {
                     $email_field = $email_field[1];
                 }
             }
-            if ( is_numeric($email_field) && ! empty($email_field) ) {
+            if ( is_numeric( $email_field ) && ! empty( $email_field ) ) {
 				$email_field = '[' . $email_field . ']';
             }
 
@@ -1213,16 +1213,16 @@ 
             $new_notification2 = array(
                 'post_content'  => array(
                     'email_message' => $notification['ar_email_message'],
-                    'email_subject' => isset($notification['ar_email_subject']) ? $notification['ar_email_subject'] : '',
+                    'email_subject' => isset( $notification['ar_email_subject'] ) ? $notification['ar_email_subject'] : '',
                     'email_to'      => $email_field,
-                    'plain_text'    => isset($notification['ar_plain_text']) ? $notification['ar_plain_text'] : 0,
+                    'plain_text'    => isset( $notification['ar_plain_text'] ) ? $notification['ar_plain_text'] : 0,
                     'inc_user_info' => 0,
                 ),
 				'post_name'     => $form_id . '_email_' . count( $notifications ),
             );
 
-            $reply_to = isset($notification['ar_reply_to']) ? $notification['ar_reply_to'] : '';
-            $reply_to_name = isset($notification['ar_reply_to_name']) ? $notification['ar_reply_to_name'] : '';
+            $reply_to = isset( $notification['ar_reply_to'] ) ? $notification['ar_reply_to'] : '';
+            $reply_to_name = isset( $notification['ar_reply_to_name'] ) ? $notification['ar_reply_to_name'] : '';
 
 			if ( ! empty( $reply_to ) ) {
 				$new_notification2['post_content']['reply_to'] = $reply_to;

classes/models/FrmAntiSpam.php

Indentation +10 added lines, -10 removed lines

@@ -11,7 +11,7 @@ 
 
 		/* Check if logged in */
 		if ( is_user_logged_in() ) {
-		    return $response;
+			return $response;
 		}
 
 		/* Honeypot */
@@ -65,10 +65,10 @@ 
 	}
 
 	/**
-	* Check for form submission time
-	*
-	* @return  boolean    TRUE if the action time is less than 5 seconds
-	*/
+	 * Check for form submission time
+	 *
+	 * @return  boolean    TRUE if the action time is less than 5 seconds
+	 */
 
 	private static function _is_shortest_time() {
 		$too_short = false;
@@ -124,11 +124,11 @@ 
 	}
 
 	/**
-	* Check for an IPv6 address
-	*
-	* @param   string   $ip  IP to validate
-	* @return  boolean       TRUE if IPv6
-	*/
+	 * Check for an IPv6 address
+	 *
+	 * @param   string   $ip  IP to validate
+	 * @return  boolean       TRUE if IPv6
+	 */
 
 	private static function _is_ipv6( $ip ) {
 		if ( function_exists('filter_var') ) {

Doc Comments +9 added lines

@@ -98,6 +98,9 @@ 
 		return (bool) preg_match( '/\[url[=\]].*\[\/url\]/is', $body );
 	}
 	
+	/**
+	 * @param string $client_ip
+	 */
 	private static function _is_fake_ip( $client_ip, $client_host = false ) {
 		/* Remote Host */
 		$host_by_ip = gethostbyaddr( $client_ip );
@@ -159,6 +162,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $ip
+	 */
 	private static function _cut_ip( $ip, $cut_end = true ) {
 		$separator = ( self::_is_ipv4( $ip ) ? '.' : ':' );
 		$part = ( $cut_end ? strrchr( $ip, $separator ) : strstr( $ip, $separator ) );
@@ -252,6 +258,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $ip
+	 */
 	private static function _is_dnsbl_spam( $ip ) {
 
 		$response = wp_safe_remote_request(

Spacing +6 added lines, -6 removed lines

@@ -138,7 +138,7 @@ 
 	*/
 
 	private static function _is_ipv6( $ip ) {
-		if ( function_exists('filter_var') ) {
+		if ( function_exists( 'filter_var' ) ) {
 			return filter_var( $ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6 ) !== false;
 		} else {
 			return ! self::_is_ipv4( $ip );
@@ -152,7 +152,7 @@ 
 	 * @return  integer       TRUE if IPv4
 	 */
 	private static function _is_ipv4( $ip ) {
-		if ( function_exists('filter_var') ) {
+		if ( function_exists( 'filter_var' ) ) {
 			return filter_var( $ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 ) !== false;
 		} else {
 			return preg_match( '/^\d{1,3}(\.\d{1,3}){3,3}$/', $ip );
@@ -232,15 +232,15 @@ 
 				}
 
 				/* Ignore non utf-8 chars */
-				$comment[ $field ] = ( function_exists('iconv') ? iconv( 'utf-8', 'utf-8//TRANSLIT', $comment[ $field ] ) : $comment[ $field ] );
+				$comment[$field] = ( function_exists( 'iconv' ) ? iconv( 'utf-8', 'utf-8//TRANSLIT', $comment[$field] ) : $comment[$field] );
 
-				if ( empty( $comment[ $field ] ) ) {
+				if ( empty( $comment[$field] ) ) {
 					continue;
 				}
 
 				/* Perform regex */
-				if ( preg_match( '/' .$regexp. '/isu', $comment[ $field ] ) ) {
-					$hits[ $field ] = true;
+				if ( preg_match( '/' . $regexp . '/isu', $comment[$field] ) ) {
+					$hits[$field] = true;
 				}
 			}
 

classes/models/FrmEntryValidate.php

Indentation +110 added lines, -110 removed lines

@@ -1,26 +1,26 @@ 
 <?php
 
 class FrmEntryValidate {
-    public static function validate( $values, $exclude = false ) {
-        global $wpdb;
+	public static function validate( $values, $exclude = false ) {
+		global $wpdb;
 
-        FrmEntry::sanitize_entry_post( $values );
-        $errors = array();
+		FrmEntry::sanitize_entry_post( $values );
+		$errors = array();
 
-        if ( ! isset($values['form_id']) || ! isset($values['item_meta']) ) {
-            $errors['form'] = __( 'There was a problem with your submission. Please try again.', 'formidable' );
-            return $errors;
-        }
+		if ( ! isset($values['form_id']) || ! isset($values['item_meta']) ) {
+			$errors['form'] = __( 'There was a problem with your submission. Please try again.', 'formidable' );
+			return $errors;
+		}
 
 		if ( FrmAppHelper::is_admin() && is_user_logged_in() && ( ! isset( $values[ 'frm_submit_entry_' . $values['form_id'] ] ) || ! wp_verify_nonce( $values[ 'frm_submit_entry_' . $values['form_id'] ], 'frm_submit_entry_nonce' ) ) ) {
-            $errors['form'] = __( 'You do not have permission to do that', 'formidable' );
-        }
+			$errors['form'] = __( 'You do not have permission to do that', 'formidable' );
+		}
 
-        if ( ! isset($values['item_key']) || $values['item_key'] == '' ) {
+		if ( ! isset($values['item_key']) || $values['item_key'] == '' ) {
 			$_POST['item_key'] = $values['item_key'] = FrmAppHelper::get_unique_key( '', $wpdb->prefix . 'frm_items', 'item_key' );
-        }
+		}
 
-        $where = apply_filters('frm_posted_field_ids', array( 'fi.form_id' => $values['form_id'] ) );
+		$where = apply_filters('frm_posted_field_ids', array( 'fi.form_id' => $values['form_id'] ) );
 		// Don't get subfields
 		$where['fr.parent_form_id'] = array( null, 0 );
 		// Don't get excluded fields (like file upload fields in the ajax validation)
@@ -28,42 +28,42 @@ 
 			$where['fi.type not'] = $exclude;
 		}
 
-        $posted_fields = FrmField::getAll($where, 'field_order');
+		$posted_fields = FrmField::getAll($where, 'field_order');
 
-        // Pass exclude value to validate_field function so it can be used for repeating sections
-        $args = array( 'exclude' => $exclude );
+		// Pass exclude value to validate_field function so it can be used for repeating sections
+		$args = array( 'exclude' => $exclude );
 
-        foreach ( $posted_fields as $posted_field ) {
-            self::validate_field($posted_field, $errors, $values, $args);
-            unset($posted_field);
-        }
+		foreach ( $posted_fields as $posted_field ) {
+			self::validate_field($posted_field, $errors, $values, $args);
+			unset($posted_field);
+		}
 
-        // check for spam
-        self::spam_check( $exclude, $values, $errors );
+		// check for spam
+		self::spam_check( $exclude, $values, $errors );
 
-        $errors = apply_filters( 'frm_validate_entry', $errors, $values, compact('exclude') );
+		$errors = apply_filters( 'frm_validate_entry', $errors, $values, compact('exclude') );
 
-        return $errors;
-    }
+		return $errors;
+	}
 
-    public static function validate_field( $posted_field, &$errors, $values, $args = array() ) {
-        $defaults = array(
-            'id'              => $posted_field->id,
-            'parent_field_id' => '', // the id of the repeat or embed form
-            'key_pointer'     => '', // the pointer in the posted array
-            'exclude'         => array(), // exclude these field types from validation
-        );
-        $args = wp_parse_args( $args, $defaults );
+	public static function validate_field( $posted_field, &$errors, $values, $args = array() ) {
+		$defaults = array(
+			'id'              => $posted_field->id,
+			'parent_field_id' => '', // the id of the repeat or embed form
+			'key_pointer'     => '', // the pointer in the posted array
+			'exclude'         => array(), // exclude these field types from validation
+		);
+		$args = wp_parse_args( $args, $defaults );
 
-        if ( empty($args['parent_field_id']) ) {
+		if ( empty($args['parent_field_id']) ) {
 			$value = isset( $values['item_meta'][ $args['id'] ] ) ? $values['item_meta'][ $args['id'] ] : '';
-        } else {
-            // value is from a nested form
-            $value = $values;
-        }
+		} else {
+			// value is from a nested form
+			$value = $values;
+		}
 
-        // Check for values in "Other" fields
-        FrmEntriesHelper::maybe_set_other_validation( $posted_field, $value, $args );
+		// Check for values in "Other" fields
+		FrmEntriesHelper::maybe_set_other_validation( $posted_field, $value, $args );
 
 		self::maybe_clear_value_for_default_blank_setting( $posted_field, $value );
 
@@ -72,11 +72,11 @@ 
 			$value = reset($value);
 		}
 
-        if ( $posted_field->required == '1' && ! is_array( $value ) && trim( $value ) == '' ) {
+		if ( $posted_field->required == '1' && ! is_array( $value ) && trim( $value ) == '' ) {
 			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
-        } else if ( $posted_field->type == 'text' && ! isset( $_POST['item_name'] ) ) {
-            $_POST['item_name'] = $value;
-        }
+		} else if ( $posted_field->type == 'text' && ! isset( $_POST['item_name'] ) ) {
+			$_POST['item_name'] = $value;
+		}
 
 		if ( $value != '' ) {
 			self::validate_url_field( $errors, $posted_field, $value, $args );
@@ -85,13 +85,13 @@ 
 			self::validate_phone_field( $errors, $posted_field, $value, $args );
 		}
 
-        FrmEntriesHelper::set_posted_value($posted_field, $value, $args);
+		FrmEntriesHelper::set_posted_value($posted_field, $value, $args);
 
-        self::validate_recaptcha($errors, $posted_field, $args);
+		self::validate_recaptcha($errors, $posted_field, $args);
 
 		$errors = apply_filters( 'frm_validate_' . $posted_field->type . '_field_entry', $errors, $posted_field, $value, $args );
 		$errors = apply_filters( 'frm_validate_field_entry', $errors, $posted_field, $value, $args );
-    }
+	}
 
 	private static function maybe_clear_value_for_default_blank_setting( $field, &$value ) {
 		if ( FrmField::is_option_true_in_object( $field, 'default_blank' ) && $value == $field->default_value ) {
@@ -101,32 +101,32 @@ 
 
 	public static function validate_url_field( &$errors, $field, &$value, $args ) {
 		if ( $value == '' || ! in_array( $field->type, array( 'website', 'url', 'image' ) ) ) {
-            return;
-        }
+			return;
+		}
 
-        if ( trim($value) == 'http://' ) {
-            $value = '';
-        } else {
-            $value = esc_url_raw( $value );
+		if ( trim($value) == 'http://' ) {
+			$value = '';
+		} else {
+			$value = esc_url_raw( $value );
 			$value = preg_match( '/^(https?|ftps?|mailto|news|feed|telnet):/is', $value ) ? $value : 'http://' . $value;
-        }
+		}
 
-        // validate the url format
+		// validate the url format
 		if ( ! preg_match('/^http(s)?:\/\/(?:localhost|(?:[\da-z\.-]+\.[\da-z\.-]+))/i', $value) ) {
 			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
 		}
-    }
+	}
 
 	public static function validate_email_field( &$errors, $field, $value, $args ) {
-        if ( $value == '' || $field->type != 'email' ) {
-            return;
-        }
+		if ( $value == '' || $field->type != 'email' ) {
+			return;
+		}
 
-        //validate the email format
-        if ( ! is_email($value) ) {
+		//validate the email format
+		if ( ! is_email($value) ) {
 			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
-        }
-    }
+		}
+	}
 
 	public static function validate_number_field( &$errors, $field, $value, $args ) {
 		//validate the number format
@@ -220,9 +220,9 @@ 
 	}
 
 	public static function validate_recaptcha( &$errors, $field, $args ) {
-        if ( $field->type != 'captcha' || FrmAppHelper::is_admin() || apply_filters( 'frm_is_field_hidden', false, $field, stripslashes_deep( $_POST ) ) ) {
-            return;
-        }
+		if ( $field->type != 'captcha' || FrmAppHelper::is_admin() || apply_filters( 'frm_is_field_hidden', false, $field, stripslashes_deep( $_POST ) ) ) {
+			return;
+		}
 
 		$frm_settings = FrmAppHelper::get_settings();
 		if ( empty( $frm_settings->pubkey ) ) {
@@ -230,57 +230,57 @@ 
 			return;
 		}
 
-        if ( ! isset($_POST['g-recaptcha-response']) ) {
-            // If captcha is missing, check if it was already verified
+		if ( ! isset($_POST['g-recaptcha-response']) ) {
+			// If captcha is missing, check if it was already verified
 			if ( ! isset( $_POST['recaptcha_checked'] ) || ! wp_verify_nonce( $_POST['recaptcha_checked'], 'frm_ajax' ) ) {
-                // There was no captcha submitted
+				// There was no captcha submitted
 				$errors[ 'field' . $args['id'] ] = __( 'The captcha is missing from this form', 'formidable' );
-            }
-            return;
-        }
+			}
+			return;
+		}
 
-        $arg_array = array(
-            'body'      => array(
+		$arg_array = array(
+			'body'      => array(
 				'secret'   => $frm_settings->privkey,
 				'response' => $_POST['g-recaptcha-response'],
 				'remoteip' => FrmAppHelper::get_ip_address(),
 			),
 		);
-        $resp = wp_remote_post( 'https://www.google.com/recaptcha/api/siteverify', $arg_array );
-        $response = json_decode(wp_remote_retrieve_body( $resp ), true);
+		$resp = wp_remote_post( 'https://www.google.com/recaptcha/api/siteverify', $arg_array );
+		$response = json_decode(wp_remote_retrieve_body( $resp ), true);
 
-        if ( isset( $response['success'] ) && ! $response['success'] ) {
-            // What happens when the CAPTCHA was entered incorrectly
+		if ( isset( $response['success'] ) && ! $response['success'] ) {
+			// What happens when the CAPTCHA was entered incorrectly
 			$errors[ 'field' . $args['id'] ] = ( ! isset( $field->field_options['invalid'] ) || $field->field_options['invalid'] == '' ) ? $frm_settings->re_msg : $field->field_options['invalid'];
-        } else if ( is_wp_error( $resp ) ) {
+		} else if ( is_wp_error( $resp ) ) {
 			$error_string = $resp->get_error_message();
 			$errors[ 'field' . $args['id'] ] = __( 'There was a problem verifying your recaptcha', 'formidable' );
 			$errors[ 'field' . $args['id'] ] .= ' ' . $error_string;
-        }
-    }
-
-    /**
-     * check for spam
-     * @param boolean $exclude
-     * @param array $values
-     * @param array $errors by reference
-     */
-    public static function spam_check( $exclude, $values, &$errors ) {
-        if ( ! empty( $exclude ) || ! isset( $values['item_meta'] ) || empty( $values['item_meta'] ) || ! empty( $errors ) ) {
-            // only check spam if there are no other errors
-            return;
-        }
-
-    	if ( self::blacklist_check( $values ) ) {
-            $errors['spam'] = __( 'Your entry appears to be blacklist spam!', 'formidable' );
-    	}
-
-        if ( self::is_akismet_spam( $values ) ) {
+		}
+	}
+
+	/**
+	 * check for spam
+	 * @param boolean $exclude
+	 * @param array $values
+	 * @param array $errors by reference
+	 */
+	public static function spam_check( $exclude, $values, &$errors ) {
+		if ( ! empty( $exclude ) || ! isset( $values['item_meta'] ) || empty( $values['item_meta'] ) || ! empty( $errors ) ) {
+			// only check spam if there are no other errors
+			return;
+		}
+
+		if ( self::blacklist_check( $values ) ) {
+			$errors['spam'] = __( 'Your entry appears to be blacklist spam!', 'formidable' );
+		}
+
+		if ( self::is_akismet_spam( $values ) ) {
 			if ( self::is_akismet_enabled_for_user( $values['form_id'] ) ) {
 				$errors['spam'] = __( 'Your entry appears to be spam!', 'formidable' );
 			}
-	    }
-    }
+		}
+	}
 
 	private static function is_akismet_spam( $values ) {
 		global $wpcom_api_key;
@@ -292,15 +292,15 @@ 
 		return ( isset( $form->options['akismet'] ) && ! empty( $form->options['akismet'] ) && ( $form->options['akismet'] != 'logged' || ! is_user_logged_in() ) );
 	}
 
-    public static function blacklist_check( $values ) {
-        if ( ! apply_filters('frm_check_blacklist', true, $values) ) {
-            return false;
-        }
+	public static function blacklist_check( $values ) {
+		if ( ! apply_filters('frm_check_blacklist', true, $values) ) {
+			return false;
+		}
 
-    	$mod_keys = trim( get_option( 'blacklist_keys' ) );
-    	if ( empty( $mod_keys ) ) {
-    		return false;
-    	}
+		$mod_keys = trim( get_option( 'blacklist_keys' ) );
+		if ( empty( $mod_keys ) ) {
+			return false;
+		}
 
 		$content = FrmEntriesHelper::entry_array_to_string( $values );
 		if ( empty( $content ) ) {
@@ -312,7 +312,7 @@ 
 		$user_info = self::get_spam_check_user_info( $values );
 
 		return wp_blacklist_check( $user_info['comment_author'], $user_info['comment_author_email'], $user_info['comment_author_url'], $content, $ip, $user_agent );
-    }
+	}
 
 	/**
 	 * Check entries for Akismet spam

Spacing +35 added lines, -35 removed lines

@@ -7,20 +7,20 @@ 
         FrmEntry::sanitize_entry_post( $values );
         $errors = array();
 
-        if ( ! isset($values['form_id']) || ! isset($values['item_meta']) ) {
+        if ( ! isset( $values['form_id'] ) || ! isset( $values['item_meta'] ) ) {
             $errors['form'] = __( 'There was a problem with your submission. Please try again.', 'formidable' );
             return $errors;
         }
 
-		if ( FrmAppHelper::is_admin() && is_user_logged_in() && ( ! isset( $values[ 'frm_submit_entry_' . $values['form_id'] ] ) || ! wp_verify_nonce( $values[ 'frm_submit_entry_' . $values['form_id'] ], 'frm_submit_entry_nonce' ) ) ) {
+		if ( FrmAppHelper::is_admin() && is_user_logged_in() && ( ! isset( $values['frm_submit_entry_' . $values['form_id']] ) || ! wp_verify_nonce( $values['frm_submit_entry_' . $values['form_id']], 'frm_submit_entry_nonce' ) ) ) {
             $errors['form'] = __( 'You do not have permission to do that', 'formidable' );
         }
 
-        if ( ! isset($values['item_key']) || $values['item_key'] == '' ) {
+        if ( ! isset( $values['item_key'] ) || $values['item_key'] == '' ) {
 			$_POST['item_key'] = $values['item_key'] = FrmAppHelper::get_unique_key( '', $wpdb->prefix . 'frm_items', 'item_key' );
         }
 
-        $where = apply_filters('frm_posted_field_ids', array( 'fi.form_id' => $values['form_id'] ) );
+        $where = apply_filters( 'frm_posted_field_ids', array( 'fi.form_id' => $values['form_id'] ) );
 		// Don't get subfields
 		$where['fr.parent_form_id'] = array( null, 0 );
 		// Don't get excluded fields (like file upload fields in the ajax validation)
@@ -28,20 +28,20 @@ 
 			$where['fi.type not'] = $exclude;
 		}
 
-        $posted_fields = FrmField::getAll($where, 'field_order');
+        $posted_fields = FrmField::getAll( $where, 'field_order' );
 
         // Pass exclude value to validate_field function so it can be used for repeating sections
         $args = array( 'exclude' => $exclude );
 
         foreach ( $posted_fields as $posted_field ) {
-            self::validate_field($posted_field, $errors, $values, $args);
-            unset($posted_field);
+            self::validate_field( $posted_field, $errors, $values, $args );
+            unset( $posted_field );
         }
 
         // check for spam
         self::spam_check( $exclude, $values, $errors );
 
-        $errors = apply_filters( 'frm_validate_entry', $errors, $values, compact('exclude') );
+        $errors = apply_filters( 'frm_validate_entry', $errors, $values, compact( 'exclude' ) );
 
         return $errors;
     }
@@ -55,8 +55,8 @@ 
         );
         $args = wp_parse_args( $args, $defaults );
 
-        if ( empty($args['parent_field_id']) ) {
-			$value = isset( $values['item_meta'][ $args['id'] ] ) ? $values['item_meta'][ $args['id'] ] : '';
+        if ( empty( $args['parent_field_id'] ) ) {
+			$value = isset( $values['item_meta'][$args['id']] ) ? $values['item_meta'][$args['id']] : '';
         } else {
             // value is from a nested form
             $value = $values;
@@ -68,12 +68,12 @@ 
 		self::maybe_clear_value_for_default_blank_setting( $posted_field, $value );
 
 		// Reset arrays with only one value if it's not a field where array keys need to be preserved
-		if ( is_array($value) && count( $value ) == 1 && isset( $value[0] ) ) {
-			$value = reset($value);
+		if ( is_array( $value ) && count( $value ) == 1 && isset( $value[0] ) ) {
+			$value = reset( $value );
 		}
 
         if ( $posted_field->required == '1' && ! is_array( $value ) && trim( $value ) == '' ) {
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $posted_field, 'blank' );
         } else if ( $posted_field->type == 'text' && ! isset( $_POST['item_name'] ) ) {
             $_POST['item_name'] = $value;
         }
@@ -85,9 +85,9 @@ 
 			self::validate_phone_field( $errors, $posted_field, $value, $args );
 		}
 
-        FrmEntriesHelper::set_posted_value($posted_field, $value, $args);
+        FrmEntriesHelper::set_posted_value( $posted_field, $value, $args );
 
-        self::validate_recaptcha($errors, $posted_field, $args);
+        self::validate_recaptcha( $errors, $posted_field, $args );
 
 		$errors = apply_filters( 'frm_validate_' . $posted_field->type . '_field_entry', $errors, $posted_field, $value, $args );
 		$errors = apply_filters( 'frm_validate_field_entry', $errors, $posted_field, $value, $args );
@@ -104,7 +104,7 @@ 
             return;
         }
 
-        if ( trim($value) == 'http://' ) {
+        if ( trim( $value ) == 'http://' ) {
             $value = '';
         } else {
             $value = esc_url_raw( $value );
@@ -112,8 +112,8 @@ 
         }
 
         // validate the url format
-		if ( ! preg_match('/^http(s)?:\/\/(?:localhost|(?:[\da-z\.-]+\.[\da-z\.-]+))/i', $value) ) {
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
+		if ( ! preg_match( '/^http(s)?:\/\/(?:localhost|(?:[\da-z\.-]+\.[\da-z\.-]+))/i', $value ) ) {
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
 		}
     }
 
@@ -123,8 +123,8 @@ 
         }
 
         //validate the email format
-        if ( ! is_email($value) ) {
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
+        if ( ! is_email( $value ) ) {
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
         }
     }
 
@@ -134,8 +134,8 @@ 
 			return;
 		}
 
-		if ( ! is_numeric( $value) ) {
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
+		if ( ! is_numeric( $value ) ) {
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
 		}
 
 		// validate number settings
@@ -145,9 +145,9 @@ 
 			if ( $frm_settings->use_html && isset( $field->field_options['minnum'] ) && isset( $field->field_options['maxnum'] ) ) {
 				//minnum maxnum
 				if ( (float) $value < $field->field_options['minnum'] ) {
-					$errors[ 'field' . $args['id'] ] = __( 'Please select a higher number', 'formidable' );
+					$errors['field' . $args['id']] = __( 'Please select a higher number', 'formidable' );
 				} else if ( (float) $value > $field->field_options['maxnum'] ) {
-					$errors[ 'field' . $args['id'] ] = __( 'Please select a lower number', 'formidable' );
+					$errors['field' . $args['id']] = __( 'Please select a lower number', 'formidable' );
 				}
 			}
 		}
@@ -159,7 +159,7 @@ 
 			$pattern = self::phone_format( $field );
 
 			if ( ! preg_match( $pattern, $value ) ) {
-				$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
+				$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $field, 'invalid' );
 			}
 		}
 	}
@@ -230,11 +230,11 @@ 
 			return;
 		}
 
-        if ( ! isset($_POST['g-recaptcha-response']) ) {
+        if ( ! isset( $_POST['g-recaptcha-response'] ) ) {
             // If captcha is missing, check if it was already verified
 			if ( ! isset( $_POST['recaptcha_checked'] ) || ! wp_verify_nonce( $_POST['recaptcha_checked'], 'frm_ajax' ) ) {
                 // There was no captcha submitted
-				$errors[ 'field' . $args['id'] ] = __( 'The captcha is missing from this form', 'formidable' );
+				$errors['field' . $args['id']] = __( 'The captcha is missing from this form', 'formidable' );
             }
             return;
         }
@@ -247,15 +247,15 @@ 
 			),
 		);
         $resp = wp_remote_post( 'https://www.google.com/recaptcha/api/siteverify', $arg_array );
-        $response = json_decode(wp_remote_retrieve_body( $resp ), true);
+        $response = json_decode( wp_remote_retrieve_body( $resp ), true );
 
         if ( isset( $response['success'] ) && ! $response['success'] ) {
             // What happens when the CAPTCHA was entered incorrectly
-			$errors[ 'field' . $args['id'] ] = ( ! isset( $field->field_options['invalid'] ) || $field->field_options['invalid'] == '' ) ? $frm_settings->re_msg : $field->field_options['invalid'];
+			$errors['field' . $args['id']] = ( ! isset( $field->field_options['invalid'] ) || $field->field_options['invalid'] == '' ) ? $frm_settings->re_msg : $field->field_options['invalid'];
         } else if ( is_wp_error( $resp ) ) {
 			$error_string = $resp->get_error_message();
-			$errors[ 'field' . $args['id'] ] = __( 'There was a problem verifying your recaptcha', 'formidable' );
-			$errors[ 'field' . $args['id'] ] .= ' ' . $error_string;
+			$errors['field' . $args['id']] = __( 'There was a problem verifying your recaptcha', 'formidable' );
+			$errors['field' . $args['id']] .= ' ' . $error_string;
         }
     }
 
@@ -284,7 +284,7 @@ 
 
 	private static function is_akismet_spam( $values ) {
 		global $wpcom_api_key;
-		return ( is_callable('Akismet::http_post') && ( get_option('wordpress_api_key') || $wpcom_api_key ) && self::akismet( $values ) );
+		return ( is_callable( 'Akismet::http_post' ) && ( get_option( 'wordpress_api_key' ) || $wpcom_api_key ) && self::akismet( $values ) );
 	}
 
 	private static function is_akismet_enabled_for_user( $form_id ) {
@@ -293,7 +293,7 @@ 
 	}
 
     public static function blacklist_check( $values ) {
-        if ( ! apply_filters('frm_check_blacklist', true, $values) ) {
+        if ( ! apply_filters( 'frm_check_blacklist', true, $values ) ) {
             return false;
         }
 
@@ -350,7 +350,7 @@ 
 		$datas['user_agent'] = FrmAppHelper::get_server_value( 'HTTP_USER_AGENT' );
 		$datas['referrer'] = isset( $_SERVER['HTTP_REFERER'] ) ? FrmAppHelper::get_server_value( 'HTTP_REFERER' ) : false;
 		$datas['blog_lang'] = get_locale();
-		$datas['blog_charset'] = get_option('blog_charset');
+		$datas['blog_charset'] = get_option( 'blog_charset' );
 
 		if ( akismet_test_mode() ) {
 			$datas['is_test'] = 'true';
@@ -403,7 +403,7 @@ 
 
 			// Send any potentially useful $_SERVER vars, but avoid sending junk we don't need.
 			if ( $include_value ) {
-				$datas[ $key ] = $value;
+				$datas[$key] = $value;
 			}
 			unset( $key, $value );
 		}

classes/helpers/FrmFieldsHelper.php

Indentation +706 added lines, -706 removed lines

@@ -7,71 +7,71 @@ 
 
 	public static function setup_new_vars( $type = '', $form_id = '' ) {
 
-        if ( strpos($type, '|') ) {
-            list($type, $setting) = explode('|', $type);
-        }
-
-        $defaults = self::get_default_field_opts($type, $form_id);
-        $defaults['field_options']['custom_html'] = self::get_default_html($type);
-
-        $values = array();
-
-        foreach ( $defaults as $var => $default ) {
-            if ( $var == 'field_options' ) {
-                $values['field_options'] = array();
-                foreach ( $default as $opt_var => $opt_default ) {
-                    $values['field_options'][ $opt_var ] = $opt_default;
-                    unset($opt_var, $opt_default);
-                }
-            } else {
-                $values[ $var ] = $default;
-            }
-            unset($var, $default);
-        }
-
-        if ( isset( $setting ) && ! empty( $setting ) ) {
-            if ( in_array( $type, array( 'data', 'lookup' ) ) ) {
-                $values['field_options']['data_type'] = $setting;
-            } else {
-                $values['field_options'][ $setting ] = 1;
-            }
-        }
-
-        if ( $type == 'radio' || $type == 'checkbox' ) {
-            $values['options'] = serialize( array(
-                __( 'Option 1', 'formidable' ),
-                __( 'Option 2', 'formidable' ),
-            ) );
-        } else if ( $type == 'select' ) {
-            $values['options'] = serialize( array(
-                '', __( 'Option 1', 'formidable' ),
-            ) );
-        } else if ( $type == 'textarea' ) {
-            $values['field_options']['max'] = '5';
-        } else if ( $type == 'captcha' ) {
-            $frm_settings = FrmAppHelper::get_settings();
-            $values['invalid'] = $frm_settings->re_msg;
-        } else if ( 'url' == $type ) {
-            $values['name'] = __( 'Website', 'formidable' );
-        }
+		if ( strpos($type, '|') ) {
+			list($type, $setting) = explode('|', $type);
+		}
+
+		$defaults = self::get_default_field_opts($type, $form_id);
+		$defaults['field_options']['custom_html'] = self::get_default_html($type);
+
+		$values = array();
+
+		foreach ( $defaults as $var => $default ) {
+			if ( $var == 'field_options' ) {
+				$values['field_options'] = array();
+				foreach ( $default as $opt_var => $opt_default ) {
+					$values['field_options'][ $opt_var ] = $opt_default;
+					unset($opt_var, $opt_default);
+				}
+			} else {
+				$values[ $var ] = $default;
+			}
+			unset($var, $default);
+		}
+
+		if ( isset( $setting ) && ! empty( $setting ) ) {
+			if ( in_array( $type, array( 'data', 'lookup' ) ) ) {
+				$values['field_options']['data_type'] = $setting;
+			} else {
+				$values['field_options'][ $setting ] = 1;
+			}
+		}
+
+		if ( $type == 'radio' || $type == 'checkbox' ) {
+			$values['options'] = serialize( array(
+				__( 'Option 1', 'formidable' ),
+				__( 'Option 2', 'formidable' ),
+			) );
+		} else if ( $type == 'select' ) {
+			$values['options'] = serialize( array(
+				'', __( 'Option 1', 'formidable' ),
+			) );
+		} else if ( $type == 'textarea' ) {
+			$values['field_options']['max'] = '5';
+		} else if ( $type == 'captcha' ) {
+			$frm_settings = FrmAppHelper::get_settings();
+			$values['invalid'] = $frm_settings->re_msg;
+		} else if ( 'url' == $type ) {
+			$values['name'] = __( 'Website', 'formidable' );
+		}
 
 		$fields = FrmField::field_selection();
-        $fields = array_merge($fields, FrmField::pro_field_selection());
+		$fields = array_merge($fields, FrmField::pro_field_selection());
 
-        if ( isset( $fields[ $type ] ) ) {
-            $values['name'] = is_array( $fields[ $type ] ) ? $fields[ $type ]['name'] : $fields[ $type ];
-        }
+		if ( isset( $fields[ $type ] ) ) {
+			$values['name'] = is_array( $fields[ $type ] ) ? $fields[ $type ]['name'] : $fields[ $type ];
+		}
 
-        unset($fields);
+		unset($fields);
 
-        return $values;
-    }
+		return $values;
+	}
 
 	public static function get_html_id( $field, $plus = '' ) {
 		return apply_filters( 'frm_field_html_id', 'field_' . $field['field_key'] . $plus, $field );
-    }
+	}
 
-    public static function setup_edit_vars( $record, $doing_ajax = false ) {
+	public static function setup_edit_vars( $record, $doing_ajax = false ) {
 		$values = array( 'id' => $record->id, 'form_id' => $record->form_id );
 		$defaults = array(
 			'name'          => $record->name,
@@ -84,86 +84,86 @@ 
 		);
 
 		if ( $doing_ajax ) {
-            $values = $values + $defaults;
-            $values['form_name'] = '';
+			$values = $values + $defaults;
+			$values['form_name'] = '';
 		} else {
 			foreach ( $defaults as $var => $default ) {
-                $values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'htmlspecialchars' );
-                unset($var, $default);
-            }
+				$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'htmlspecialchars' );
+				unset($var, $default);
+			}
 
 			$values['form_name'] = $record->form_id ? FrmForm::getName( $record->form_id ) : '';
-        }
+		}
 
 		unset( $defaults );
 
-        $values['options'] = $record->options;
-        $values['field_options'] = $record->field_options;
+		$values['options'] = $record->options;
+		$values['field_options'] = $record->field_options;
 
-        $defaults = self::get_default_field_opts($values['type'], $record, true);
+		$defaults = self::get_default_field_opts($values['type'], $record, true);
 
 		if ( $values['type'] == 'captcha' ) {
-            $frm_settings = FrmAppHelper::get_settings();
-            $defaults['invalid'] = $frm_settings->re_msg;
-        }
+			$frm_settings = FrmAppHelper::get_settings();
+			$defaults['invalid'] = $frm_settings->re_msg;
+		}
 
 		foreach ( $defaults as $opt => $default ) {
-            $values[ $opt ] = isset( $record->field_options[ $opt ] ) ? $record->field_options[ $opt ] : $default;
-            unset($opt, $default);
-        }
+			$values[ $opt ] = isset( $record->field_options[ $opt ] ) ? $record->field_options[ $opt ] : $default;
+			unset($opt, $default);
+		}
 
-        $values['custom_html'] = (isset($record->field_options['custom_html'])) ? $record->field_options['custom_html'] : self::get_default_html($record->type);
+		$values['custom_html'] = (isset($record->field_options['custom_html'])) ? $record->field_options['custom_html'] : self::get_default_html($record->type);
 
 		return apply_filters( 'frm_setup_edit_field_vars', $values, array( 'doing_ajax' => $doing_ajax ) );
-    }
+	}
 
-    public static function get_default_field_opts( $type, $field, $limit = false ) {
-        $field_options = array(
-            'size' => '', 'max' => '', 'label' => '', 'blank' => '',
-            'required_indicator' => '*', 'invalid' => '', 'separate_value' => 0,
-            'clear_on_focus' => 0, 'default_blank' => 0, 'classes' => '',
+	public static function get_default_field_opts( $type, $field, $limit = false ) {
+		$field_options = array(
+			'size' => '', 'max' => '', 'label' => '', 'blank' => '',
+			'required_indicator' => '*', 'invalid' => '', 'separate_value' => 0,
+			'clear_on_focus' => 0, 'default_blank' => 0, 'classes' => '',
 			'custom_html' => '', 'captcha_size' => 'normal', 'captcha_theme' => 'light',
-        );
+		);
 
 		if ( $limit ) {
-            return $field_options;
+			return $field_options;
 		}
 
-        global $wpdb;
+		global $wpdb;
 
-        $form_id = (is_numeric($field)) ? $field : $field->form_id;
+		$form_id = (is_numeric($field)) ? $field : $field->form_id;
 
 		$key = is_numeric( $field ) ? FrmAppHelper::get_unique_key( '', $wpdb->prefix . 'frm_fields', 'field_key' ) : $field->field_key;
 
-        $field_count = FrmDb::get_var( 'frm_fields', array( 'form_id' => $form_id ), 'field_order', array( 'order_by' => 'field_order DESC' ) );
+		$field_count = FrmDb::get_var( 'frm_fields', array( 'form_id' => $form_id ), 'field_order', array( 'order_by' => 'field_order DESC' ) );
 
-        $frm_settings = FrmAppHelper::get_settings();
-        return array(
-            'name' => __( 'Untitled', 'formidable' ), 'description' => '',
+		$frm_settings = FrmAppHelper::get_settings();
+		return array(
+			'name' => __( 'Untitled', 'formidable' ), 'description' => '',
 			'field_key' => $key, 'type' => $type, 'options' => '', 'default_value' => '',
 			'field_order' => $field_count + 1, 'required' => false,
-            'blank' => $frm_settings->blank_msg, 'unique_msg' => $frm_settings->unique_msg,
-            'invalid' => __( 'This field is invalid', 'formidable' ), 'form_id' => $form_id,
+			'blank' => $frm_settings->blank_msg, 'unique_msg' => $frm_settings->unique_msg,
+			'invalid' => __( 'This field is invalid', 'formidable' ), 'form_id' => $form_id,
 			'field_options' => $field_options,
-        );
-    }
+		);
+	}
 
-    public static function fill_field( &$values, $field, $form_id, $new_key = '' ) {
-        global $wpdb;
+	public static function fill_field( &$values, $field, $form_id, $new_key = '' ) {
+		global $wpdb;
 
 		$values['field_key'] = FrmAppHelper::get_unique_key( $new_key, $wpdb->prefix . 'frm_fields', 'field_key' );
-        $values['form_id'] = $form_id;
-        $values['options'] = maybe_serialize($field->options);
-        $values['default_value'] = maybe_serialize($field->default_value);
-
-        foreach ( array( 'name', 'description', 'type', 'field_order', 'field_options', 'required' ) as $col ) {
-            $values[ $col ] = $field->{$col};
-        }
-    }
-
-    /**
-     * @since 2.0
-     */
+		$values['form_id'] = $form_id;
+		$values['options'] = maybe_serialize($field->options);
+		$values['default_value'] = maybe_serialize($field->default_value);
+
+		foreach ( array( 'name', 'description', 'type', 'field_order', 'field_options', 'required' ) as $col ) {
+			$values[ $col ] = $field->{$col};
+		}
+	}
+
+	/**
+	 * @since 2.0
+	 */
 	public static function get_error_msg( $field, $error ) {
 		$frm_settings = FrmAppHelper::get_settings();
 		$default_settings = $frm_settings->default_options();
@@ -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,82 +207,82 @@ 
     [if error]<div class="frm_error">[error]</div>[/if error]
 </div>
 DEFAULT_HTML;
-        } else {
+		} else {
 			$default_html = apply_filters('frm_other_custom_html', '', $type);
-        }
+		}
 
-        return apply_filters('frm_custom_html', $default_html, $type);
-    }
+		return apply_filters('frm_custom_html', $default_html, $type);
+	}
 
 	public static function replace_shortcodes( $html, $field, $errors = array(), $form = false, $args = array() ) {
-        $html = apply_filters('frm_before_replace_shortcodes', $html, $field, $errors, $form);
+		$html = apply_filters('frm_before_replace_shortcodes', $html, $field, $errors, $form);
 
-        $defaults = array(
+		$defaults = array(
 			'field_name'    => 'item_meta[' . $field['id'] . ']',
 			'field_id'      => $field['id'],
-            'field_plus_id' => '',
-            'section_id'    => '',
-        );
-        $args = wp_parse_args($args, $defaults);
-        $field_name = $args['field_name'];
-        $field_id = $args['field_id'];
-        $html_id = self::get_html_id($field, $args['field_plus_id']);
+			'field_plus_id' => '',
+			'section_id'    => '',
+		);
+		$args = wp_parse_args($args, $defaults);
+		$field_name = $args['field_name'];
+		$field_id = $args['field_id'];
+		$html_id = self::get_html_id($field, $args['field_plus_id']);
 
-        if ( FrmField::is_multiple_select($field) ) {
-            $field_name .= '[]';
-        }
+		if ( FrmField::is_multiple_select($field) ) {
+			$field_name .= '[]';
+		}
 
-        //replace [id]
-        $html = str_replace('[id]', $field_id, $html);
+		//replace [id]
+		$html = str_replace('[id]', $field_id, $html);
 
-        // Remove the for attribute for captcha
-        if ( $field['type'] == 'captcha' ) {
-            $html = str_replace(' for="field_[key]"', '', $html);
-        }
+		// Remove the for attribute for captcha
+		if ( $field['type'] == 'captcha' ) {
+			$html = str_replace(' for="field_[key]"', '', $html);
+		}
 
-        // set the label for
-        $html = str_replace('field_[key]', $html_id, $html);
+		// set the label for
+		$html = str_replace('field_[key]', $html_id, $html);
 
-        //replace [key]
-        $html = str_replace('[key]', $field['field_key'], $html);
+		//replace [key]
+		$html = str_replace('[key]', $field['field_key'], $html);
 
-        //replace [description] and [required_label] and [error]
+		//replace [description] and [required_label] and [error]
 		$required = FrmField::is_required( $field ) ? $field['required_indicator'] : '';
-        if ( ! is_array( $errors ) ) {
-            $errors = array();
-        }
+		if ( ! is_array( $errors ) ) {
+			$errors = array();
+		}
 		$error = isset( $errors[ 'field' . $field_id ] ) ? $errors[ 'field' . $field_id ] : false;
 
-        //If field type is section heading, add class so a bottom margin can be added to either the h3 or description
-        if ( $field['type'] == 'divider' ) {
-            if ( FrmField::is_option_true( $field, 'description' ) ) {
-                $html = str_replace( 'frm_description', 'frm_description frm_section_spacing', $html );
-            } else {
-                $html = str_replace('[label_position]', '[label_position] frm_section_spacing', $html);
-            }
-        }
+		//If field type is section heading, add class so a bottom margin can be added to either the h3 or description
+		if ( $field['type'] == 'divider' ) {
+			if ( FrmField::is_option_true( $field, 'description' ) ) {
+				$html = str_replace( 'frm_description', 'frm_description frm_section_spacing', $html );
+			} else {
+				$html = str_replace('[label_position]', '[label_position] frm_section_spacing', $html);
+			}
+		}
 
 		foreach ( array( 'description' => $field['description'], 'required_label' => $required, 'error' => $error ) as $code => $value ) {
-            self::remove_inline_conditions( ( $value && $value != '' ), $code, $value, $html );
-        }
+			self::remove_inline_conditions( ( $value && $value != '' ), $code, $value, $html );
+		}
 
-        //replace [required_class]
+		//replace [required_class]
 		$required_class = FrmField::is_required( $field ) ? ' frm_required_field' : '';
-        $html = str_replace('[required_class]', $required_class, $html);
+		$html = str_replace('[required_class]', $required_class, $html);
 
-        //replace [label_position]
-        $field['label'] = apply_filters('frm_html_label_position', $field['label'], $field, $form);
-        $field['label'] = ( $field['label'] && $field['label'] != '' ) ? $field['label'] : 'top';
+		//replace [label_position]
+		$field['label'] = apply_filters('frm_html_label_position', $field['label'], $field, $form);
+		$field['label'] = ( $field['label'] && $field['label'] != '' ) ? $field['label'] : 'top';
 		$html = str_replace( '[label_position]', ( ( in_array( $field['type'], array( 'divider', 'end_divider', 'break' ) ) ) ? $field['label'] : ' frm_primary_label' ), $html );
 
-        //replace [field_name]
-        $html = str_replace('[field_name]', $field['name'], $html);
+		//replace [field_name]
+		$html = str_replace('[field_name]', $field['name'], $html);
 
 		self::add_field_div_classes( $field_id, $field, $errors, $html );
 
-        //replace [entry_key]
-        $entry_key = FrmAppHelper::simple_get( 'entry', 'sanitize_title' );
-        $html = str_replace('[entry_key]', $entry_key, $html);
+		//replace [entry_key]
+		$entry_key = FrmAppHelper::simple_get( 'entry', 'sanitize_title' );
+		$html = str_replace('[entry_key]', $entry_key, $html);
 
 		if ( $form ) {
 			$form = (array) $form;
@@ -296,57 +296,57 @@ 
 
 		self::process_wp_shortcodes( $form, $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 );
+		}
 
-        $html .= "\n";
+		$html .= "\n";
 
-        //Return html if conf_field to prevent loop
-        if ( isset($field['conf_field']) && $field['conf_field'] == 'stop' ) {
-            return $html;
-        }
+		//Return html if conf_field to prevent loop
+		if ( isset($field['conf_field']) && $field['conf_field'] == 'stop' ) {
+			return $html;
+		}
 
-        //If field is in repeating section
-        if ( $args['section_id'] ) {
-            $html = apply_filters('frm_replace_shortcodes', $html, $field, array( 'errors' => $errors, 'form' => $form, 'field_name' => $field_name, 'field_id' => $field_id, 'field_plus_id' => $args['field_plus_id'], 'section_id' => $args['section_id'] ));
-        } else {
-            $html = apply_filters('frm_replace_shortcodes', $html, $field, array( 'errors' => $errors, 'form' => $form ));
-        }
+		//If field is in repeating section
+		if ( $args['section_id'] ) {
+			$html = apply_filters('frm_replace_shortcodes', $html, $field, array( 'errors' => $errors, 'form' => $form, 'field_name' => $field_name, 'field_id' => $field_id, 'field_plus_id' => $args['field_plus_id'], 'section_id' => $args['section_id'] ));
+		} else {
+			$html = apply_filters('frm_replace_shortcodes', $html, $field, array( 'errors' => $errors, 'form' => $form ));
+		}
 
 		self::remove_collapse_shortcode( $html );
 
-        return $html;
-    }
+		return $html;
+	}
 
 	/**
 	 * This filters shortcodes in the field HTML
@@ -411,46 +411,46 @@ 
 		return $classes;
 	}
 
-    public static function remove_inline_conditions( $no_vars, $code, $replace_with, &$html ) {
-        if ( $no_vars ) {
+	public static function remove_inline_conditions( $no_vars, $code, $replace_with, &$html ) {
+		if ( $no_vars ) {
 			$html = str_replace( '[if ' . $code . ']', '', $html );
 			$html = str_replace( '[/if ' . $code . ']', '', $html );
-        } else {
+		} else {
 			$html = preg_replace( '/(\[if\s+' . $code . '\])(.*?)(\[\/if\s+' . $code . '\])/mis', '', $html );
-        }
+		}
 
 		$html = str_replace( '[' . $code . ']', $replace_with, $html );
-    }
+	}
 
 	public static function get_shortcode_tag( $shortcodes, $short_key, $args ) {
 		$args = wp_parse_args( $args, array( 'conditional' => false, 'conditional_check' => false, 'foreach' => false ) );
-        if ( ( $args['conditional'] || $args['foreach'] ) && ! $args['conditional_check'] ) {
-            $args['conditional_check'] = true;
-        }
-
-        $prefix = '';
-        if ( $args['conditional_check'] ) {
-            if ( $args['conditional'] ) {
-                $prefix = 'if ';
-            } else if ( $args['foreach'] ) {
-                $prefix = 'foreach ';
-            }
-        }
-
-        $with_tags = $args['conditional_check'] ? 3 : 2;
-        if ( ! empty( $shortcodes[ $with_tags ][ $short_key ] ) ) {
-            $tag = str_replace( '[' . $prefix, '', $shortcodes[0][ $short_key ] );
-            $tag = str_replace(']', '', $tag);
-            $tags = explode(' ', $tag);
-            if ( is_array($tags) ) {
-                $tag = $tags[0];
-            }
-        } else {
-            $tag = $shortcodes[ $with_tags - 1 ][ $short_key ];
-        }
-
-        return $tag;
-    }
+		if ( ( $args['conditional'] || $args['foreach'] ) && ! $args['conditional_check'] ) {
+			$args['conditional_check'] = true;
+		}
+
+		$prefix = '';
+		if ( $args['conditional_check'] ) {
+			if ( $args['conditional'] ) {
+				$prefix = 'if ';
+			} else if ( $args['foreach'] ) {
+				$prefix = 'foreach ';
+			}
+		}
+
+		$with_tags = $args['conditional_check'] ? 3 : 2;
+		if ( ! empty( $shortcodes[ $with_tags ][ $short_key ] ) ) {
+			$tag = str_replace( '[' . $prefix, '', $shortcodes[0][ $short_key ] );
+			$tag = str_replace(']', '', $tag);
+			$tags = explode(' ', $tag);
+			if ( is_array($tags) ) {
+				$tag = $tags[0];
+			}
+		} else {
+			$tag = $shortcodes[ $with_tags - 1 ][ $short_key ];
+		}
+
+		return $tag;
+	}
 
 	/**
 	 * Remove [collapse_this] if it's still included after all processing
@@ -488,8 +488,8 @@ 
 		}
 		$api_js_url = apply_filters( 'frm_recaptcha_js_url', $api_js_url );
 
-        wp_register_script( 'recaptcha-api', $api_js_url, '', true );
-        wp_enqueue_script( 'recaptcha-api' );
+		wp_register_script( 'recaptcha-api', $api_js_url, '', true );
+		wp_enqueue_script( 'recaptcha-api' );
 
 		// for reverse compatability
 		$field['captcha_size'] = ( $field['captcha_size'] == 'default' ) ? 'normal' : $field['captcha_size'];
@@ -497,40 +497,40 @@ 
 ?>
 <div id="field_<?php echo esc_attr( $field['field_key'] ) ?>" class="<?php echo esc_attr( $class_prefix ) ?>g-recaptcha" data-sitekey="<?php echo esc_attr( $frm_settings->pubkey ) ?>" data-size="<?php echo esc_attr( $field['captcha_size'] ) ?>" data-theme="<?php echo esc_attr( $field['captcha_theme'] ) ?>"></div>
 <?php
-    }
+	}
 
 	public static function show_single_option( $field ) {
-        $field_name = $field['name'];
-        $html_id = self::get_html_id($field);
-        foreach ( $field['options'] as $opt_key => $opt ) {
-            $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-            $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
+		$field_name = $field['name'];
+		$html_id = self::get_html_id($field);
+		foreach ( $field['options'] as $opt_key => $opt ) {
+			$field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
+			$opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
 
-            // If this is an "Other" option, get the HTML for it
+			// If this is an "Other" option, get the HTML for it
 			if ( self::is_other_opt( $opt_key ) ) {
-                // Get string for Other text field, if needed
+				// Get string for Other text field, if needed
 				$other_val = self::get_other_val( compact( 'opt_key', 'field' ) );
 				require( FrmAppHelper::plugin_path() . '/pro/classes/views/frmpro-fields/other-option.php' );
-            } else {
+			} else {
 				require( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/single-option.php' );
-            }
-        }
-    }
+			}
+		}
+	}
 
 	public static function get_term_link( $tax_id ) {
-        $tax = get_taxonomy($tax_id);
-        if ( ! $tax ) {
-            return;
-        }
+		$tax = get_taxonomy($tax_id);
+		if ( ! $tax ) {
+			return;
+		}
 
-        $link = sprintf(
-            __( 'Please add options from the WordPress "%1$s" page', 'formidable' ),
+		$link = sprintf(
+			__( 'Please add options from the WordPress "%1$s" page', 'formidable' ),
 			'<a href="' . esc_url( admin_url( 'edit-tags.php?taxonomy=' . $tax->name ) ) . '" target="_blank">' . ( empty( $tax->labels->name ) ? __( 'Categories' ) : $tax->labels->name ) . '</a>'
-        );
-        unset($tax);
+		);
+		unset($tax);
 
-        return $link;
-    }
+		return $link;
+	}
 
 	public static function value_meets_condition( $observed_value, $cond, $hide_opt ) {
 		// Remove white space from hide_opt
@@ -541,195 +541,195 @@ 
 		$observed_value = wp_kses_post( $observed_value );
 		$hide_opt = wp_kses_post( $hide_opt );
 
-        if ( is_array($observed_value) ) {
-            return self::array_value_condition($observed_value, $cond, $hide_opt);
-        }
-
-        $m = false;
-        if ( $cond == '==' ) {
-            $m = $observed_value == $hide_opt;
-        } else if ( $cond == '!=' ) {
-            $m = $observed_value != $hide_opt;
-        } else if ( $cond == '>' ) {
-            $m = $observed_value > $hide_opt;
-        } else if ( $cond == '<' ) {
-            $m = $observed_value < $hide_opt;
-        } else if ( $cond == 'LIKE' || $cond == 'not LIKE' ) {
-            $m = stripos($observed_value, $hide_opt);
-            if ( $cond == 'not LIKE' ) {
-                $m = ( $m === false ) ? true : false;
-            } else {
-                $m = ( $m === false ) ? false : true;
-            }
-        }
-        return $m;
-    }
+		if ( is_array($observed_value) ) {
+			return self::array_value_condition($observed_value, $cond, $hide_opt);
+		}
+
+		$m = false;
+		if ( $cond == '==' ) {
+			$m = $observed_value == $hide_opt;
+		} else if ( $cond == '!=' ) {
+			$m = $observed_value != $hide_opt;
+		} else if ( $cond == '>' ) {
+			$m = $observed_value > $hide_opt;
+		} else if ( $cond == '<' ) {
+			$m = $observed_value < $hide_opt;
+		} else if ( $cond == 'LIKE' || $cond == 'not LIKE' ) {
+			$m = stripos($observed_value, $hide_opt);
+			if ( $cond == 'not LIKE' ) {
+				$m = ( $m === false ) ? true : false;
+			} else {
+				$m = ( $m === false ) ? false : true;
+			}
+		}
+		return $m;
+	}
 
 	public static function array_value_condition( $observed_value, $cond, $hide_opt ) {
-        $m = false;
-        if ( $cond == '==' ) {
-            if ( is_array($hide_opt) ) {
-                $m = array_intersect($hide_opt, $observed_value);
-                $m = empty($m) ? false : true;
-            } else {
-                $m = in_array($hide_opt, $observed_value);
-            }
-        } else if ( $cond == '!=' ) {
-            $m = ! in_array($hide_opt, $observed_value);
-        } else if ( $cond == '>' ) {
-            $min = min($observed_value);
-            $m = $min > $hide_opt;
-        } else if ( $cond == '<' ) {
-            $max = max($observed_value);
-            $m = $max < $hide_opt;
-        } else if ( $cond == 'LIKE' || $cond == 'not LIKE' ) {
-            foreach ( $observed_value as $ob ) {
-                $m = strpos($ob, $hide_opt);
-                if ( $m !== false ) {
-                    $m = true;
-                    break;
-                }
-            }
-
-            if ( $cond == 'not LIKE' ) {
-                $m = ( $m === false ) ? true : false;
-            }
-        }
-
-        return $m;
-    }
-
-    /**
-     * Replace a few basic shortcodes and field ids
-     * @since 2.0
-     * @return string
-     */
+		$m = false;
+		if ( $cond == '==' ) {
+			if ( is_array($hide_opt) ) {
+				$m = array_intersect($hide_opt, $observed_value);
+				$m = empty($m) ? false : true;
+			} else {
+				$m = in_array($hide_opt, $observed_value);
+			}
+		} else if ( $cond == '!=' ) {
+			$m = ! in_array($hide_opt, $observed_value);
+		} else if ( $cond == '>' ) {
+			$min = min($observed_value);
+			$m = $min > $hide_opt;
+		} else if ( $cond == '<' ) {
+			$max = max($observed_value);
+			$m = $max < $hide_opt;
+		} else if ( $cond == 'LIKE' || $cond == 'not LIKE' ) {
+			foreach ( $observed_value as $ob ) {
+				$m = strpos($ob, $hide_opt);
+				if ( $m !== false ) {
+					$m = true;
+					break;
+				}
+			}
+
+			if ( $cond == 'not LIKE' ) {
+				$m = ( $m === false ) ? true : false;
+			}
+		}
+
+		return $m;
+	}
+
+	/**
+	 * Replace a few basic shortcodes and field ids
+	 * @since 2.0
+	 * @return string
+	 */
 	public static function basic_replace_shortcodes( $value, $form, $entry ) {
-        if ( strpos($value, '[sitename]') !== false ) {
-            $new_value = wp_specialchars_decode( FrmAppHelper::site_name(), ENT_QUOTES );
-            $value = str_replace('[sitename]', $new_value, $value);
-        }
+		if ( strpos($value, '[sitename]') !== false ) {
+			$new_value = wp_specialchars_decode( FrmAppHelper::site_name(), ENT_QUOTES );
+			$value = str_replace('[sitename]', $new_value, $value);
+		}
 
-        $value = apply_filters('frm_content', $value, $form, $entry);
-        $value = do_shortcode($value);
+		$value = apply_filters('frm_content', $value, $form, $entry);
+		$value = do_shortcode($value);
 
-        return $value;
-    }
+		return $value;
+	}
 
 	public static function get_shortcodes( $content, $form_id ) {
-        if ( FrmAppHelper::pro_is_installed() ) {
-            return FrmProDisplaysHelper::get_shortcodes($content, $form_id);
-        }
+		if ( FrmAppHelper::pro_is_installed() ) {
+			return FrmProDisplaysHelper::get_shortcodes($content, $form_id);
+		}
 
-        $fields = FrmField::getAll( array( 'fi.form_id' => (int) $form_id, 'fi.type not' => FrmField::no_save_fields() ) );
+		$fields = FrmField::getAll( array( 'fi.form_id' => (int) $form_id, 'fi.type not' => FrmField::no_save_fields() ) );
 
-        $tagregexp = self::allowed_shortcodes($fields);
+		$tagregexp = self::allowed_shortcodes($fields);
 
-        preg_match_all("/\[(if )?($tagregexp)\b(.*?)(?:(\/))?\](?:(.+?)\[\/\2\])?/s", $content, $matches, PREG_PATTERN_ORDER);
+		preg_match_all("/\[(if )?($tagregexp)\b(.*?)(?:(\/))?\](?:(.+?)\[\/\2\])?/s", $content, $matches, PREG_PATTERN_ORDER);
 
-        return $matches;
-    }
+		return $matches;
+	}
 
 	public static function allowed_shortcodes( $fields = array() ) {
-        $tagregexp = array(
-            'editlink', 'id', 'key', 'ip',
-            'siteurl', 'sitename', 'admin_email',
-            'post[-|_]id', 'created[-|_]at', 'updated[-|_]at', 'updated[-|_]by',
+		$tagregexp = array(
+			'editlink', 'id', 'key', 'ip',
+			'siteurl', 'sitename', 'admin_email',
+			'post[-|_]id', 'created[-|_]at', 'updated[-|_]at', 'updated[-|_]by',
 			'parent[-|_]id',
-        );
+		);
 
-        foreach ( $fields as $field ) {
-            $tagregexp[] = $field->id;
-            $tagregexp[] = $field->field_key;
-        }
+		foreach ( $fields as $field ) {
+			$tagregexp[] = $field->id;
+			$tagregexp[] = $field->field_key;
+		}
 
-        $tagregexp = implode('|', $tagregexp);
-        return $tagregexp;
-    }
+		$tagregexp = implode('|', $tagregexp);
+		return $tagregexp;
+	}
 
 	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
-        $shortcode_values = array(
-           'id'     => $entry->id,
-           'key'    => $entry->item_key,
-           'ip'     => $entry->ip,
-        );
+		$shortcode_values = array(
+		   'id'     => $entry->id,
+		   'key'    => $entry->item_key,
+		   'ip'     => $entry->ip,
+		);
 
-        foreach ( $shortcodes[0] as $short_key => $tag ) {
-            $atts = 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 ) ) {
@@ -743,82 +743,82 @@ 
 						}
 					}
 
-                    unset($field);
-                break;
-            }
+					unset($field);
+				break;
+			}
 
-            if ( isset($replace_with) ) {
-                $content = str_replace( $shortcodes[0][ $short_key ], $replace_with, $content );
-            }
+			if ( isset($replace_with) ) {
+				$content = str_replace( $shortcodes[0][ $short_key ], $replace_with, $content );
+			}
 
-            unset($atts, $conditional, $replace_with);
+			unset($atts, $conditional, $replace_with);
 		}
 
 		return $content;
-    }
-
-    /**
-     * Get the value to replace a few standard shortcodes
-     *
-     * @since 2.0
-     * @return string
-     */
-    public static function dynamic_default_values( $tag, $atts = array(), $return_array = false ) {
-        $new_value = '';
-        switch ( $tag ) {
-            case 'admin_email':
-                $new_value = get_option('admin_email');
-                break;
-            case 'siteurl':
-                $new_value = FrmAppHelper::site_url();
-                break;
-            case 'frmurl':
-                $new_value = FrmAppHelper::plugin_url();
-                break;
-            case 'sitename':
-                $new_value = FrmAppHelper::site_name();
-                break;
-            case 'get':
-                $new_value = self::process_get_shortcode( $atts, $return_array );
-                break;
-        }
-
-        return $new_value;
-    }
-
-    /**
-     * Process the [get] shortcode
-     *
-     * @since 2.0
-     * @return string|array
-     */
-    public static function process_get_shortcode( $atts, $return_array = false ) {
-        if ( ! isset($atts['param']) ) {
-            return '';
-        }
-
-        if ( strpos($atts['param'], '&#91;') ) {
-            $atts['param'] = str_replace('&#91;', '[', $atts['param']);
-            $atts['param'] = str_replace('&#93;', ']', $atts['param']);
-        }
-
-        $new_value = FrmAppHelper::get_param($atts['param'], '');
-        $new_value = FrmAppHelper::get_query_var( $new_value, $atts['param'] );
-
-        if ( $new_value == '' ) {
-            if ( ! isset($atts['prev_val']) ) {
-                $atts['prev_val'] = '';
-            }
-
-            $new_value = isset($atts['default']) ? $atts['default'] : $atts['prev_val'];
-        }
-
-        if ( is_array($new_value) && ! $return_array ) {
-            $new_value = implode(', ', $new_value);
-        }
-
-        return $new_value;
-    }
+	}
+
+	/**
+	 * Get the value to replace a few standard shortcodes
+	 *
+	 * @since 2.0
+	 * @return string
+	 */
+	public static function dynamic_default_values( $tag, $atts = array(), $return_array = false ) {
+		$new_value = '';
+		switch ( $tag ) {
+			case 'admin_email':
+				$new_value = get_option('admin_email');
+				break;
+			case 'siteurl':
+				$new_value = FrmAppHelper::site_url();
+				break;
+			case 'frmurl':
+				$new_value = FrmAppHelper::plugin_url();
+				break;
+			case 'sitename':
+				$new_value = FrmAppHelper::site_name();
+				break;
+			case 'get':
+				$new_value = self::process_get_shortcode( $atts, $return_array );
+				break;
+		}
+
+		return $new_value;
+	}
+
+	/**
+	 * Process the [get] shortcode
+	 *
+	 * @since 2.0
+	 * @return string|array
+	 */
+	public static function process_get_shortcode( $atts, $return_array = false ) {
+		if ( ! isset($atts['param']) ) {
+			return '';
+		}
+
+		if ( strpos($atts['param'], '&#91;') ) {
+			$atts['param'] = str_replace('&#91;', '[', $atts['param']);
+			$atts['param'] = str_replace('&#93;', ']', $atts['param']);
+		}
+
+		$new_value = FrmAppHelper::get_param($atts['param'], '');
+		$new_value = FrmAppHelper::get_query_var( $new_value, $atts['param'] );
+
+		if ( $new_value == '' ) {
+			if ( ! isset($atts['prev_val']) ) {
+				$atts['prev_val'] = '';
+			}
+
+			$new_value = isset($atts['default']) ? $atts['default'] : $atts['prev_val'];
+		}
+
+		if ( is_array($new_value) && ! $return_array ) {
+			$new_value = implode(', ', $new_value);
+		}
+
+		return $new_value;
+	}
 
 	public static function get_display_value( $replace_with, $field, $atts = array() ) {
 		$sep = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
@@ -826,14 +826,14 @@ 
 		$replace_with = apply_filters( 'frm_get_' . $field->type . '_display_value', $replace_with, $field, $atts );
 		$replace_with = apply_filters( 'frm_get_display_value', $replace_with, $field, $atts );
 
-        if ( $field->type == 'textarea' || $field->type == 'rte' ) {
-            $autop = isset($atts['wpautop']) ? $atts['wpautop'] : true;
-            if ( apply_filters('frm_use_wpautop', $autop) ) {
-                if ( is_array($replace_with) ) {
-                    $replace_with = implode("\n", $replace_with);
-                }
-                $replace_with = wpautop($replace_with);
-            }
+		if ( $field->type == 'textarea' || $field->type == 'rte' ) {
+			$autop = isset($atts['wpautop']) ? $atts['wpautop'] : true;
+			if ( apply_filters('frm_use_wpautop', $autop) ) {
+				if ( is_array($replace_with) ) {
+					$replace_with = implode("\n", $replace_with);
+				}
+				$replace_with = wpautop($replace_with);
+			}
 			unset( $autop );
 		} else if ( is_array( $replace_with ) ) {
 			$replace_with = implode( $sep, $replace_with );
@@ -843,58 +843,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,
@@ -970,20 +970,20 @@ 
 		}
 
 		return $other_val;
-    }
-
-    /**
-    * Check if there is a saved value for the "Other" text field. If so, set it as the $other_val.
-    * Intended for front-end use
-    *
-    * @since 2.0.6
-    *
-    * @param array $args should include field, opt_key and field name
-    * @param boolean $other_opt
-    * @param string $checked
-    * @return string $other_val
-    */
-    public static function prepare_other_input( $args, &$other_opt, &$checked ) {
+	}
+
+	/**
+	 * Check if there is a saved value for the "Other" text field. If so, set it as the $other_val.
+	 * Intended for front-end use
+	 *
+	 * @since 2.0.6
+	 *
+	 * @param array $args should include field, opt_key and field name
+	 * @param boolean $other_opt
+	 * @param string $checked
+	 * @return string $other_val
+	 */
+	public static function prepare_other_input( $args, &$other_opt, &$checked ) {
 		//Check if this is an "Other" option
 		if ( ! self::is_other_opt( $args['opt_key'] ) ) {
 			return;
@@ -999,8 +999,8 @@ 
 			$checked = 'checked="checked" ';
 		}
 
-        return $other_args;
-    }
+		return $other_args;
+	}
 
 	/**
 	 * @param array $args
@@ -1049,8 +1049,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' );
@@ -1071,15 +1071,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;
 
@@ -1137,10 +1137,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 . ' ';
@@ -1155,153 +1155,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' );
@@ -1338,10 +1338,10 @@ 
 		return FrmField::is_required( $field );
 	}
 
-    public static function maybe_get_field( &$field ) {
+	public static function maybe_get_field( &$field ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmField::maybe_get_field' );
 		FrmField::maybe_get_field( $field );
-    }
+	}
 
 	public static function dropdown_categories( $args ) {
 		_deprecated_function( __FUNCTION__, '2.02.07', 'FrmProPost::get_category_dropdown' );

Spacing +164 added lines, -164 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,53 +268,53 @@ 
 
         //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 );
 
 		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 );
 		}
 
 		self::process_wp_shortcodes( $form, $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;
@@ -323,24 +323,24 @@ 
                 $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 );
         }
 
         $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 );
@@ -392,14 +392,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'];
@@ -438,15 +438,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;
@@ -501,10 +501,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 ) ) {
@@ -518,7 +518,7 @@ 
     }
 
 	public static function get_term_link( $tax_id ) {
-        $tax = get_taxonomy($tax_id);
+        $tax = get_taxonomy( $tax_id );
         if ( ! $tax ) {
             return;
         }
@@ -527,7 +527,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;
     }
@@ -541,8 +541,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;
@@ -555,7 +555,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 {
@@ -568,23 +568,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;
@@ -605,27 +605,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;
     }
@@ -643,7 +643,7 @@ 
             $tagregexp[] = $field->field_key;
         }
 
-        $tagregexp = implode('|', $tagregexp);
+        $tagregexp = implode( '|', $tagregexp );
         return $tagregexp;
     }
 
@@ -655,28 +655,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;
 
@@ -684,25 +684,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':
@@ -719,16 +719,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;
@@ -743,15 +743,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;
@@ -767,7 +767,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();
@@ -793,28 +793,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;
@@ -827,12 +827,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 ) ) {
@@ -854,14 +854,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' ) );
@@ -870,8 +870,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 );
         }
     }
 
@@ -916,21 +916,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;
 		}
@@ -939,8 +939,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 {
 			/**
@@ -952,8 +952,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
@@ -1010,7 +1010,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
@@ -1036,7 +1036,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
@@ -1155,15 +1155,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;
@@ -1176,7 +1176,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',
@@ -1267,35 +1267,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' ),
         );