Strategy11 / formidable-forms

classes/helpers/FrmAppHelper.php

Doc Comments +9 added lines

@@ -746,6 +746,9 @@ 
 		return FrmFieldsHelper::prepare_other_input( $args, $other_opt, $checked );
     }
 
+	/**
+	 * @param string $function
+	 */
 	public static function recursive_function_map( $value, $function ) {
 		if ( is_array( $value ) ) {
 			$original_function = $function;
@@ -1173,6 +1176,9 @@ 
         return $sub . (($len < $original_len) ? $continue : '');
     }
 
+	/**
+	 * @param string[] $function_names
+	 */
 	public static function mb_function( $function_names, $args ) {
 		$mb_function_name = $function_names[0];
 		$function_name = $function_names[1];
@@ -1206,6 +1212,9 @@ 
         return $formatted;
     }
 
+	/**
+	 * @param string $time_format
+	 */
 	private static function add_time_to_date( $time_format, $date ) {
 		if ( empty( $time_format ) ) {
 			$time_format = get_option('time_format');

Indentation +1114 added lines, -1114 removed lines

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

Spacing +222 added lines, -222 removed lines

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

classes/models/FrmEntryMeta.php

Doc Comments +4 added lines

@@ -61,6 +61,9 @@ 
         return $wpdb->update( $wpdb->prefix .'frm_item_metas', array( 'meta_value' => $meta_value ), $where_values );
     }
 
+	/**
+	 * @param integer $entry_id
+	 */
 	public static function update_entry_metas( $entry_id, $values ) {
         global $wpdb;
 
@@ -286,6 +289,7 @@ 
      * @param string|array $where
      * @param string $order_by
      * @param string $limit
+     * @param boolean $unique
      */
 	private static function get_ids_query( $where, $order_by, $limit, $unique, $args, array &$query ) {
         global $wpdb;

Indentation +203 added lines, -203 removed lines

@@ -5,27 +5,27 @@ 
 
 class FrmEntryMeta {
 
-    /**
-     * @param string $meta_key
-     */
+	/**
+	 * @param string $meta_key
+	 */
 	public static function add_entry_meta( $entry_id, $field_id, $meta_key = null, $meta_value ) {
-        global $wpdb;
+		global $wpdb;
 
-        if ( FrmAppHelper::is_empty_value( $meta_value ) ) {
-            // don't save blank fields
-            return;
-        }
+		if ( FrmAppHelper::is_empty_value( $meta_value ) ) {
+			// don't save blank fields
+			return;
+		}
 
-        $new_values = array(
+		$new_values = array(
 			'meta_value'    => is_array( $meta_value ) ? serialize( array_filter( $meta_value, 'FrmAppHelper::is_not_empty_value' ) ) : trim( $meta_value ),
-            'item_id'       => $entry_id,
-            'field_id'      => $field_id,
-            'created_at'    => current_time('mysql', 1),
-        );
+			'item_id'       => $entry_id,
+			'field_id'      => $field_id,
+			'created_at'    => current_time('mysql', 1),
+		);
 
-        $new_values = apply_filters('frm_add_entry_meta', $new_values);
+		$new_values = apply_filters('frm_add_entry_meta', $new_values);
 
-        $query_results = $wpdb->insert( $wpdb->prefix .'frm_item_metas', $new_values );
+		$query_results = $wpdb->insert( $wpdb->prefix .'frm_item_metas', $new_values );
 
 		if ( $query_results ) {
 			self::clear_cache();
@@ -34,40 +34,40 @@ 
 			$id = 0;
 		}
 
-        return $id;
-    }
+		return $id;
+	}
 
-    /**
-     * @param string $meta_key
-     */
+	/**
+	 * @param string $meta_key
+	 */
 	public static function update_entry_meta( $entry_id, $field_id, $meta_key = null, $meta_value ) {
-        if ( ! $field_id ) {
-            return false;
-        }
+		if ( ! $field_id ) {
+			return false;
+		}
 
-        global $wpdb;
+		global $wpdb;
 
-        $values = $where_values = array( 'item_id' => $entry_id, 'field_id' => $field_id );
-        $values['meta_value'] = $meta_value;
-        $values = apply_filters('frm_update_entry_meta', $values);
+		$values = $where_values = array( 'item_id' => $entry_id, 'field_id' => $field_id );
+		$values['meta_value'] = $meta_value;
+		$values = apply_filters('frm_update_entry_meta', $values);
 		if ( is_array($values['meta_value']) ) {
 			$values['meta_value'] = array_filter( $values['meta_value'], 'FrmAppHelper::is_not_empty_value' );
 		}
-        $meta_value = maybe_serialize($values['meta_value']);
+		$meta_value = maybe_serialize($values['meta_value']);
 
-        wp_cache_delete( $entry_id, 'frm_entry');
+		wp_cache_delete( $entry_id, 'frm_entry');
 		self::clear_cache();
 
-        return $wpdb->update( $wpdb->prefix .'frm_item_metas', array( 'meta_value' => $meta_value ), $where_values );
-    }
+		return $wpdb->update( $wpdb->prefix .'frm_item_metas', array( 'meta_value' => $meta_value ), $where_values );
+	}
 
 	public static function update_entry_metas( $entry_id, $values ) {
-        global $wpdb;
+		global $wpdb;
 
 		$prev_values = FrmDb::get_col( $wpdb->prefix .'frm_item_metas', array( 'item_id' => $entry_id, 'field_id !' => 0 ), 'field_id' );
 
-        foreach ( $values as $field_id => $meta_value ) {
-            // set the value for the file upload field and add new tags (in Pro version)
+		foreach ( $values as $field_id => $meta_value ) {
+			// set the value for the file upload field and add new tags (in Pro version)
 			$meta_value = apply_filters( 'frm_prepare_data_before_db', $meta_value, $field_id, $entry_id );
 
 			if ( $prev_values && in_array($field_id, $prev_values) ) {
@@ -85,39 +85,39 @@ 
 			}
 		}
 
-        if ( empty($prev_values) ) {
-            return;
-        }
+		if ( empty($prev_values) ) {
+			return;
+		}
 
-        $prev_values = array_diff($prev_values, array_keys($values));
+		$prev_values = array_diff($prev_values, array_keys($values));
 
-        if ( empty($prev_values) ) {
-            return;
-        }
+		if ( empty($prev_values) ) {
+			return;
+		}
 
 		// prepare the query
 		$where = array( 'item_id' => $entry_id, 'field_id' => $prev_values );
 		FrmDb::get_where_clause_and_values( $where );
 
-        // Delete any leftovers
-        $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_item_metas ' . $where['where'], $where['values'] ) );
+		// Delete any leftovers
+		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_item_metas ' . $where['where'], $where['values'] ) );
 		self::clear_cache();
-    }
+	}
 
 	public static function duplicate_entry_metas( $old_id, $new_id ) {
-        $metas = self::get_entry_meta_info($old_id);
-        foreach ( $metas as $meta ) {
-            self::add_entry_meta($new_id, $meta->field_id, null, $meta->meta_value);
-            unset($meta);
-        }
+		$metas = self::get_entry_meta_info($old_id);
+		foreach ( $metas as $meta ) {
+			self::add_entry_meta($new_id, $meta->field_id, null, $meta->meta_value);
+			unset($meta);
+		}
 		self::clear_cache();
-    }
+	}
 
 	public static function delete_entry_meta( $entry_id, $field_id ) {
-        global $wpdb;
+		global $wpdb;
 		self::clear_cache();
-        return $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->prefix}frm_item_metas WHERE field_id=%d AND item_id=%d", $field_id, $entry_id));
-    }
+		return $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->prefix}frm_item_metas WHERE field_id=%d AND item_id=%d", $field_id, $entry_id));
+	}
 
 	/**
 	 * Clear entry meta caching
@@ -142,7 +142,7 @@ 
 	}
 
 	public static function get_entry_meta_by_field( $entry_id, $field_id ) {
-        global $wpdb;
+		global $wpdb;
 
 		if ( is_object( $entry_id ) ) {
 			$entry = $entry_id;
@@ -155,24 +155,24 @@ 
 
 		if ( $cached && isset( $cached->metas ) && isset( $cached->metas[ $field_id ] ) ) {
 			$result = $cached->metas[ $field_id ];
-            return stripslashes_deep($result);
-        }
+			return stripslashes_deep($result);
+		}
 
 		$get_table = $wpdb->prefix .'frm_item_metas';
 		$query = array( 'item_id' => $entry_id );
-        if ( is_numeric($field_id) ) {
+		if ( is_numeric($field_id) ) {
 			$query['field_id'] = $field_id;
-        } else {
+		} else {
 			$get_table .= ' it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id';
 			$query['fi.field_key'] = $field_id;
-        }
+		}
 
 		$result = FrmDb::get_var( $get_table, $query, 'meta_value' );
-        $result = maybe_unserialize($result);
-        $result = stripslashes_deep($result);
+		$result = maybe_unserialize($result);
+		$result = stripslashes_deep($result);
 
-        return $result;
-    }
+		return $result;
+	}
 
 	public static function get_entry_meta( $entry_id, $field_id ) {
 		_deprecated_function( __FUNCTION__, '2.0', 'FrmEntryMeta::get_entry_meta_by_field' );
@@ -180,117 +180,117 @@ 
 	}
 
 	public static function get_entry_metas( $entry_id ) {
-        _deprecated_function( __FUNCTION__, '1.07.10');
+		_deprecated_function( __FUNCTION__, '1.07.10');
 
-        global $wpdb;
+		global $wpdb;
 		return FrmDb::get_col( $wpdb->prefix . 'frm_item_metas', array( 'item_id' => $entry_id ), 'meta_value' );
-    }
+	}
 
-    public static function get_entry_metas_for_field( $field_id, $order = '', $limit = '', $args = array() ) {
+	public static function get_entry_metas_for_field( $field_id, $order = '', $limit = '', $args = array() ) {
 		$defaults = array( 'value' => false, 'unique' => false, 'stripslashes' => true, 'is_draft' => false );
-        $args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args( $args, $defaults );
 
-        $query = array();
-        self::meta_field_query($field_id, $order, $limit, $args, $query);
-        $query = implode(' ', $query);
+		$query = array();
+		self::meta_field_query($field_id, $order, $limit, $args, $query);
+		$query = implode(' ', $query);
 
-        $cache_key = 'entry_metas_for_field_'. $field_id . $order . $limit . maybe_serialize($args);
-        $values = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, 'get_col');
+		$cache_key = 'entry_metas_for_field_'. $field_id . $order . $limit . maybe_serialize($args);
+		$values = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, 'get_col');
 
-        if ( ! $args['stripslashes'] ) {
-            return $values;
-        }
+		if ( ! $args['stripslashes'] ) {
+			return $values;
+		}
 
 		foreach ( $values as $k => $v ) {
 			$values[ $k ] = maybe_unserialize( $v );
-            unset($k, $v);
-        }
+			unset($k, $v);
+		}
 
-        return stripslashes_deep($values);
-    }
+		return stripslashes_deep($values);
+	}
 
-    /**
-     * @param string $order
-     * @param string $limit
-     */
+	/**
+	 * @param string $order
+	 * @param string $limit
+	 */
 	private static function meta_field_query( $field_id, $order, $limit, $args, array &$query ) {
-        global $wpdb;
-        $query[] = 'SELECT';
-        $query[] = $args['unique'] ? 'DISTINCT(em.meta_value)' : 'em.meta_value';
-        $query[] = 'FROM '. $wpdb->prefix .'frm_item_metas em ';
-
-        if ( ! $args['is_draft'] ) {
-            $query[] = 'INNER JOIN '. $wpdb->prefix .'frm_items e ON (e.id=em.item_id)';
-        }
-
-        if ( is_numeric($field_id) ) {
-            $query[] = $wpdb->prepare('WHERE em.field_id=%d', $field_id);
-        } else {
-            $query[] = $wpdb->prepare('LEFT JOIN '. $wpdb->prefix .'frm_fields fi ON (em.field_id = fi.id) WHERE fi.field_key=%s', $field_id);
-        }
-
-        if ( ! $args['is_draft'] ) {
-            $query[] = 'AND e.is_draft=0';
-        }
-
-        if ( $args['value'] ) {
-            $query[] = $wpdb->prepare(' AND meta_value=%s', $args['value']);
-        }
-        $query[] = $order . $limit;
-    }
+		global $wpdb;
+		$query[] = 'SELECT';
+		$query[] = $args['unique'] ? 'DISTINCT(em.meta_value)' : 'em.meta_value';
+		$query[] = 'FROM '. $wpdb->prefix .'frm_item_metas em ';
+
+		if ( ! $args['is_draft'] ) {
+			$query[] = 'INNER JOIN '. $wpdb->prefix .'frm_items e ON (e.id=em.item_id)';
+		}
+
+		if ( is_numeric($field_id) ) {
+			$query[] = $wpdb->prepare('WHERE em.field_id=%d', $field_id);
+		} else {
+			$query[] = $wpdb->prepare('LEFT JOIN '. $wpdb->prefix .'frm_fields fi ON (em.field_id = fi.id) WHERE fi.field_key=%s', $field_id);
+		}
+
+		if ( ! $args['is_draft'] ) {
+			$query[] = 'AND e.is_draft=0';
+		}
+
+		if ( $args['value'] ) {
+			$query[] = $wpdb->prepare(' AND meta_value=%s', $args['value']);
+		}
+		$query[] = $order . $limit;
+	}
 
 	public static function get_entry_meta_info( $entry_id ) {
 		return FrmDb::get_results( 'frm_item_metas', array( 'item_id' => $entry_id ) );
-    }
+	}
 
 	public static function getAll( $where = array(), $order_by = '', $limit = '', $stripslashes = false ) {
-        global $wpdb;
-        $query = 'SELECT it.*, fi.type as field_type, fi.field_key as field_key,
+		global $wpdb;
+		$query = 'SELECT it.*, fi.type as field_type, fi.field_key as field_key,
             fi.required as required, fi.form_id as field_form_id, fi.name as field_name, fi.options as fi_options
             FROM '. $wpdb->prefix .'frm_item_metas it LEFT OUTER JOIN '. $wpdb->prefix .'frm_fields fi ON it.field_id=fi.id' .
-            FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+			FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
 
-        $cache_key = 'all_'. maybe_serialize($where) . $order_by . $limit;
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_row' : 'get_results'));
+		$cache_key = 'all_'. maybe_serialize($where) . $order_by . $limit;
+		$results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_row' : 'get_results'));
 
-        if ( ! $results || ! $stripslashes ) {
-            return $results;
-        }
+		if ( ! $results || ! $stripslashes ) {
+			return $results;
+		}
 
-        foreach ( $results as $k => $result ) {
+		foreach ( $results as $k => $result ) {
 			$results[ $k ]->meta_value = stripslashes_deep( maybe_unserialize( $result->meta_value ) );
-            unset($k, $result);
-        }
+			unset($k, $result);
+		}
 
-        return $results;
-    }
+		return $results;
+	}
 
-    public static function getEntryIds( $where = array(), $order_by = '', $limit = '', $unique = true, $args = array() ) {
+	public static function getEntryIds( $where = array(), $order_by = '', $limit = '', $unique = true, $args = array() ) {
 		$defaults = array(
 			'is_draft' => false,
 			'user_id'  => '',
 			'group_by' => '',
 		);
-        $args = wp_parse_args($args, $defaults);
+		$args = wp_parse_args($args, $defaults);
 
-        $query = array();
-        self::get_ids_query($where, $order_by, $limit, $unique, $args, $query );
-        $query = implode(' ', $query);
+		$query = array();
+		self::get_ids_query($where, $order_by, $limit, $unique, $args, $query );
+		$query = implode(' ', $query);
 
-        $cache_key = 'ids_'. maybe_serialize($where) . $order_by . 'l'. $limit . 'u'. $unique . maybe_serialize($args);
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_var' : 'get_col'));
+		$cache_key = 'ids_'. maybe_serialize($where) . $order_by . 'l'. $limit . 'u'. $unique . maybe_serialize($args);
+		$results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_var' : 'get_col'));
 
-        return $results;
-    }
+		return $results;
+	}
 
-    /**
-     * @param string|array $where
-     * @param string $order_by
-     * @param string $limit
-     */
+	/**
+	 * @param string|array $where
+	 * @param string $order_by
+	 * @param string $limit
+	 */
 	private static function get_ids_query( $where, $order_by, $limit, $unique, $args, array &$query ) {
-        global $wpdb;
-        $query[] = 'SELECT';
+		global $wpdb;
+		$query[] = 'SELECT';
 
 		$defaults = array( 'return_parent_id' => false );
 		$args = array_merge( $defaults, $args );
@@ -301,91 +301,91 @@ 
 			$query[] = $unique ? 'DISTINCT(it.item_id)' : 'it.item_id';
 		}
 
-        $query[] = 'FROM '. $wpdb->prefix .'frm_item_metas it LEFT OUTER JOIN '. $wpdb->prefix .'frm_fields fi ON it.field_id=fi.id';
+		$query[] = 'FROM '. $wpdb->prefix .'frm_item_metas it LEFT OUTER JOIN '. $wpdb->prefix .'frm_fields fi ON it.field_id=fi.id';
 
-        $query[] = 'INNER JOIN '. $wpdb->prefix .'frm_items e ON (e.id=it.item_id)';
-        if ( is_array($where) ) {
-            if ( ! $args['is_draft'] ) {
-                $where['e.is_draft'] = 0;
-            } else if ( $args['is_draft'] == 1 ) {
-                $where['e.is_draft'] = 1;
-            }
+		$query[] = 'INNER JOIN '. $wpdb->prefix .'frm_items e ON (e.id=it.item_id)';
+		if ( is_array($where) ) {
+			if ( ! $args['is_draft'] ) {
+				$where['e.is_draft'] = 0;
+			} else if ( $args['is_draft'] == 1 ) {
+				$where['e.is_draft'] = 1;
+			}
 
-            if ( ! empty($args['user_id']) ) {
-                $where['e.user_id'] = $args['user_id'];
-            }
-            $query[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+			if ( ! empty($args['user_id']) ) {
+				$where['e.user_id'] = $args['user_id'];
+			}
+			$query[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
 
 			if ( $args['group_by'] ) {
 				$query[] = ' GROUP BY '. sanitize_text_field( $args['group_by'] );
 			}
-            return;
-        }
+			return;
+		}
 
 		$draft_where = $user_where = '';
-        if ( ! $args['is_draft'] ) {
+		if ( ! $args['is_draft'] ) {
 			$draft_where = $wpdb->prepare( ' AND e.is_draft=%d', 0 );
-        } else if ( $args['is_draft'] == 1 ) {
+		} else if ( $args['is_draft'] == 1 ) {
 			$draft_where = $wpdb->prepare( ' AND e.is_draft=%d', 1 );
-        }
-
-        if ( ! empty($args['user_id']) ) {
-            $user_where = $wpdb->prepare(' AND e.user_id=%d', $args['user_id']);
-        }
-
-        if ( strpos($where, ' GROUP BY ') ) {
-            // don't inject WHERE filtering after GROUP BY
-            $parts = explode(' GROUP BY ', $where);
-            $where = $parts[0];
-            $where .= $draft_where . $user_where;
-            $where .= ' GROUP BY '. $parts[1];
-        } else {
-            $where .= $draft_where . $user_where;
-        }
+		}
+
+		if ( ! empty($args['user_id']) ) {
+			$user_where = $wpdb->prepare(' AND e.user_id=%d', $args['user_id']);
+		}
+
+		if ( strpos($where, ' GROUP BY ') ) {
+			// don't inject WHERE filtering after GROUP BY
+			$parts = explode(' GROUP BY ', $where);
+			$where = $parts[0];
+			$where .= $draft_where . $user_where;
+			$where .= ' GROUP BY '. $parts[1];
+		} else {
+			$where .= $draft_where . $user_where;
+		}
 
 		// The query has already been prepared
 		$query[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
-    }
+	}
 
-    public static function search_entry_metas( $search, $field_id = '', $operator ) {
-        $cache_key = 'search_'. maybe_serialize($search) . $field_id . $operator;
-        $results = wp_cache_get($cache_key, 'frm_entry');
-        if ( false !== $results ) {
-            return $results;
-        }
+	public static function search_entry_metas( $search, $field_id = '', $operator ) {
+		$cache_key = 'search_'. maybe_serialize($search) . $field_id . $operator;
+		$results = wp_cache_get($cache_key, 'frm_entry');
+		if ( false !== $results ) {
+			return $results;
+		}
 
-        global $wpdb;
+		global $wpdb;
 		if ( is_array( $search ) ) {
-            $where = '';
+			$where = '';
 			foreach ( $search as $field => $value ) {
 				if ( $value <= 0 || ! in_array( $field, array( 'year', 'month', 'day' ) ) ) {
-                    continue;
-                }
-
-                switch ( $field ) {
-                    case 'year':
-                        $value = '%'. $value;
-                    break;
-                    case 'month':
-                        $value .= '%';
-                    break;
-                    case 'day':
-                        $value = '%'. $value .'%';
-                }
-                $where .= $wpdb->prepare(' meta_value '. $operator .' %s and', $value);
-            }
-            $where .= $wpdb->prepare(' field_id=%d', $field_id);
-            $query = "SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas". FrmAppHelper::prepend_and_or_where(' WHERE ', $where);
-        } else {
+					continue;
+				}
+
+				switch ( $field ) {
+					case 'year':
+						$value = '%'. $value;
+					break;
+					case 'month':
+						$value .= '%';
+					break;
+					case 'day':
+						$value = '%'. $value .'%';
+				}
+				$where .= $wpdb->prepare(' meta_value '. $operator .' %s and', $value);
+			}
+			$where .= $wpdb->prepare(' field_id=%d', $field_id);
+			$query = "SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas". FrmAppHelper::prepend_and_or_where(' WHERE ', $where);
+		} else {
 			if ( $operator == 'LIKE' ) {
-                $search = '%' . $search . '%';
+				$search = '%' . $search . '%';
 			}
-            $query = $wpdb->prepare("SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas WHERE meta_value {$operator} %s and field_id = %d", $search, $field_id);
-        }
+			$query = $wpdb->prepare("SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas WHERE meta_value {$operator} %s and field_id = %d", $search, $field_id);
+		}
 
-        $results = $wpdb->get_col($query, 0);
-        wp_cache_set($cache_key, $results, 'frm_entry', 300);
+		$results = $wpdb->get_col($query, 0);
+		wp_cache_set($cache_key, $results, 'frm_entry', 300);
 
-        return $results;
-    }
+		return $results;
+	}
 }

Spacing +74 added lines, -74 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -20,12 +20,12 @@ 
 			'meta_value'    => is_array( $meta_value ) ? serialize( array_filter( $meta_value, 'FrmAppHelper::is_not_empty_value' ) ) : trim( $meta_value ),
             'item_id'       => $entry_id,
             'field_id'      => $field_id,
-            'created_at'    => current_time('mysql', 1),
+            'created_at'    => current_time( 'mysql', 1 ),
         );
 
-        $new_values = apply_filters('frm_add_entry_meta', $new_values);
+        $new_values = apply_filters( 'frm_add_entry_meta', $new_values );
 
-        $query_results = $wpdb->insert( $wpdb->prefix .'frm_item_metas', $new_values );
+        $query_results = $wpdb->insert( $wpdb->prefix . 'frm_item_metas', $new_values );
 
 		if ( $query_results ) {
 			self::clear_cache();
@@ -49,32 +49,32 @@ 
 
         $values = $where_values = array( 'item_id' => $entry_id, 'field_id' => $field_id );
         $values['meta_value'] = $meta_value;
-        $values = apply_filters('frm_update_entry_meta', $values);
-		if ( is_array($values['meta_value']) ) {
+        $values = apply_filters( 'frm_update_entry_meta', $values );
+		if ( is_array( $values['meta_value'] ) ) {
 			$values['meta_value'] = array_filter( $values['meta_value'], 'FrmAppHelper::is_not_empty_value' );
 		}
-        $meta_value = maybe_serialize($values['meta_value']);
+        $meta_value = maybe_serialize( $values['meta_value'] );
 
-        wp_cache_delete( $entry_id, 'frm_entry');
+        wp_cache_delete( $entry_id, 'frm_entry' );
 		self::clear_cache();
 
-        return $wpdb->update( $wpdb->prefix .'frm_item_metas', array( 'meta_value' => $meta_value ), $where_values );
+        return $wpdb->update( $wpdb->prefix . 'frm_item_metas', array( 'meta_value' => $meta_value ), $where_values );
     }
 
 	public static function update_entry_metas( $entry_id, $values ) {
         global $wpdb;
 
-		$prev_values = FrmDb::get_col( $wpdb->prefix .'frm_item_metas', array( 'item_id' => $entry_id, 'field_id !' => 0 ), 'field_id' );
+		$prev_values = FrmDb::get_col( $wpdb->prefix . 'frm_item_metas', array( 'item_id' => $entry_id, 'field_id !' => 0 ), 'field_id' );
 
         foreach ( $values as $field_id => $meta_value ) {
             // set the value for the file upload field and add new tags (in Pro version)
 			$meta_value = apply_filters( 'frm_prepare_data_before_db', $meta_value, $field_id, $entry_id );
 
-			if ( $prev_values && in_array($field_id, $prev_values) ) {
+			if ( $prev_values && in_array( $field_id, $prev_values ) ) {
 
 				if ( ( is_array( $meta_value ) && empty( $meta_value ) ) || ( ! is_array( $meta_value ) && trim( $meta_value ) == '' ) ) {
 					// remove blank fields
-					unset( $values[ $field_id ] );
+					unset( $values[$field_id] );
 				} else {
 					// if value exists, then update it
 					self::update_entry_meta( $entry_id, $field_id, '', $meta_value );
@@ -85,13 +85,13 @@ 
 			}
 		}
 
-        if ( empty($prev_values) ) {
+        if ( empty( $prev_values ) ) {
             return;
         }
 
-        $prev_values = array_diff($prev_values, array_keys($values));
+        $prev_values = array_diff( $prev_values, array_keys( $values ) );
 
-        if ( empty($prev_values) ) {
+        if ( empty( $prev_values ) ) {
             return;
         }
 
@@ -105,10 +105,10 @@ 
     }
 
 	public static function duplicate_entry_metas( $old_id, $new_id ) {
-        $metas = self::get_entry_meta_info($old_id);
+        $metas = self::get_entry_meta_info( $old_id );
         foreach ( $metas as $meta ) {
-            self::add_entry_meta($new_id, $meta->field_id, null, $meta->meta_value);
-            unset($meta);
+            self::add_entry_meta( $new_id, $meta->field_id, null, $meta->meta_value );
+            unset( $meta );
         }
 		self::clear_cache();
     }
@@ -116,7 +116,7 @@ 
 	public static function delete_entry_meta( $entry_id, $field_id ) {
         global $wpdb;
 		self::clear_cache();
-        return $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->prefix}frm_item_metas WHERE field_id=%d AND item_id=%d", $field_id, $entry_id));
+        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}frm_item_metas WHERE field_id=%d AND item_id=%d", $field_id, $entry_id ) );
     }
 
 	/**
@@ -135,7 +135,7 @@ 
 	 */
 	public static function get_meta_value( $entry, $field_id ) {
 		if ( isset( $entry->metas ) ) {
-			return isset( $entry->metas[ $field_id ] ) ? $entry->metas[ $field_id ] : false;
+			return isset( $entry->metas[$field_id] ) ? $entry->metas[$field_id] : false;
 		} else {
 			return self::get_entry_meta_by_field( $entry->id, $field_id );
 		}
@@ -153,14 +153,14 @@ 
 			$cached = FrmAppHelper::check_cache( $entry_id, 'frm_entry' );
 		}
 
-		if ( $cached && isset( $cached->metas ) && isset( $cached->metas[ $field_id ] ) ) {
-			$result = $cached->metas[ $field_id ];
-            return stripslashes_deep($result);
+		if ( $cached && isset( $cached->metas ) && isset( $cached->metas[$field_id] ) ) {
+			$result = $cached->metas[$field_id];
+            return stripslashes_deep( $result );
         }
 
-		$get_table = $wpdb->prefix .'frm_item_metas';
+		$get_table = $wpdb->prefix . 'frm_item_metas';
 		$query = array( 'item_id' => $entry_id );
-        if ( is_numeric($field_id) ) {
+        if ( is_numeric( $field_id ) ) {
 			$query['field_id'] = $field_id;
         } else {
 			$get_table .= ' it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id';
@@ -168,8 +168,8 @@ 
         }
 
 		$result = FrmDb::get_var( $get_table, $query, 'meta_value' );
-        $result = maybe_unserialize($result);
-        $result = stripslashes_deep($result);
+        $result = maybe_unserialize( $result );
+        $result = stripslashes_deep( $result );
 
         return $result;
     }
@@ -180,7 +180,7 @@ 
 	}
 
 	public static function get_entry_metas( $entry_id ) {
-        _deprecated_function( __FUNCTION__, '1.07.10');
+        _deprecated_function( __FUNCTION__, '1.07.10' );
 
         global $wpdb;
 		return FrmDb::get_col( $wpdb->prefix . 'frm_item_metas', array( 'item_id' => $entry_id ), 'meta_value' );
@@ -191,22 +191,22 @@ 
         $args = wp_parse_args( $args, $defaults );
 
         $query = array();
-        self::meta_field_query($field_id, $order, $limit, $args, $query);
-        $query = implode(' ', $query);
+        self::meta_field_query( $field_id, $order, $limit, $args, $query );
+        $query = implode( ' ', $query );
 
-        $cache_key = 'entry_metas_for_field_'. $field_id . $order . $limit . maybe_serialize($args);
-        $values = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, 'get_col');
+        $cache_key = 'entry_metas_for_field_' . $field_id . $order . $limit . maybe_serialize( $args );
+        $values = FrmAppHelper::check_cache( $cache_key, 'frm_entry', $query, 'get_col' );
 
         if ( ! $args['stripslashes'] ) {
             return $values;
         }
 
 		foreach ( $values as $k => $v ) {
-			$values[ $k ] = maybe_unserialize( $v );
-            unset($k, $v);
+			$values[$k] = maybe_unserialize( $v );
+            unset( $k, $v );
         }
 
-        return stripslashes_deep($values);
+        return stripslashes_deep( $values );
     }
 
     /**
@@ -217,16 +217,16 @@ 
         global $wpdb;
         $query[] = 'SELECT';
         $query[] = $args['unique'] ? 'DISTINCT(em.meta_value)' : 'em.meta_value';
-        $query[] = 'FROM '. $wpdb->prefix .'frm_item_metas em ';
+        $query[] = 'FROM ' . $wpdb->prefix . 'frm_item_metas em ';
 
         if ( ! $args['is_draft'] ) {
-            $query[] = 'INNER JOIN '. $wpdb->prefix .'frm_items e ON (e.id=em.item_id)';
+            $query[] = 'INNER JOIN ' . $wpdb->prefix . 'frm_items e ON (e.id=em.item_id)';
         }
 
-        if ( is_numeric($field_id) ) {
-            $query[] = $wpdb->prepare('WHERE em.field_id=%d', $field_id);
+        if ( is_numeric( $field_id ) ) {
+            $query[] = $wpdb->prepare( 'WHERE em.field_id=%d', $field_id );
         } else {
-            $query[] = $wpdb->prepare('LEFT JOIN '. $wpdb->prefix .'frm_fields fi ON (em.field_id = fi.id) WHERE fi.field_key=%s', $field_id);
+            $query[] = $wpdb->prepare( 'LEFT JOIN ' . $wpdb->prefix . 'frm_fields fi ON (em.field_id = fi.id) WHERE fi.field_key=%s', $field_id );
         }
 
         if ( ! $args['is_draft'] ) {
@@ -234,7 +234,7 @@ 
         }
 
         if ( $args['value'] ) {
-            $query[] = $wpdb->prepare(' AND meta_value=%s', $args['value']);
+            $query[] = $wpdb->prepare( ' AND meta_value=%s', $args['value'] );
         }
         $query[] = $order . $limit;
     }
@@ -247,19 +247,19 @@ 
         global $wpdb;
         $query = 'SELECT it.*, fi.type as field_type, fi.field_key as field_key,
             fi.required as required, fi.form_id as field_form_id, fi.name as field_name, fi.options as fi_options
-            FROM '. $wpdb->prefix .'frm_item_metas it LEFT OUTER JOIN '. $wpdb->prefix .'frm_fields fi ON it.field_id=fi.id' .
-            FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+            FROM '. $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id' .
+            FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
 
-        $cache_key = 'all_'. maybe_serialize($where) . $order_by . $limit;
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_row' : 'get_results'));
+        $cache_key = 'all_' . maybe_serialize( $where ) . $order_by . $limit;
+        $results = FrmAppHelper::check_cache( $cache_key, 'frm_entry', $query, ( $limit == ' LIMIT 1' ? 'get_row' : 'get_results' ) );
 
         if ( ! $results || ! $stripslashes ) {
             return $results;
         }
 
         foreach ( $results as $k => $result ) {
-			$results[ $k ]->meta_value = stripslashes_deep( maybe_unserialize( $result->meta_value ) );
-            unset($k, $result);
+			$results[$k]->meta_value = stripslashes_deep( maybe_unserialize( $result->meta_value ) );
+            unset( $k, $result );
         }
 
         return $results;
@@ -271,14 +271,14 @@ 
 			'user_id'  => '',
 			'group_by' => '',
 		);
-        $args = wp_parse_args($args, $defaults);
+        $args = wp_parse_args( $args, $defaults );
 
         $query = array();
-        self::get_ids_query($where, $order_by, $limit, $unique, $args, $query );
-        $query = implode(' ', $query);
+        self::get_ids_query( $where, $order_by, $limit, $unique, $args, $query );
+        $query = implode( ' ', $query );
 
-        $cache_key = 'ids_'. maybe_serialize($where) . $order_by . 'l'. $limit . 'u'. $unique . maybe_serialize($args);
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_var' : 'get_col'));
+        $cache_key = 'ids_' . maybe_serialize( $where ) . $order_by . 'l' . $limit . 'u' . $unique . maybe_serialize( $args );
+        $results = FrmAppHelper::check_cache( $cache_key, 'frm_entry', $query, ( $limit == ' LIMIT 1' ? 'get_var' : 'get_col' ) );
 
         return $results;
     }
@@ -301,23 +301,23 @@ 
 			$query[] = $unique ? 'DISTINCT(it.item_id)' : 'it.item_id';
 		}
 
-        $query[] = 'FROM '. $wpdb->prefix .'frm_item_metas it LEFT OUTER JOIN '. $wpdb->prefix .'frm_fields fi ON it.field_id=fi.id';
+        $query[] = 'FROM ' . $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id';
 
-        $query[] = 'INNER JOIN '. $wpdb->prefix .'frm_items e ON (e.id=it.item_id)';
-        if ( is_array($where) ) {
+        $query[] = 'INNER JOIN ' . $wpdb->prefix . 'frm_items e ON (e.id=it.item_id)';
+        if ( is_array( $where ) ) {
             if ( ! $args['is_draft'] ) {
                 $where['e.is_draft'] = 0;
             } else if ( $args['is_draft'] == 1 ) {
                 $where['e.is_draft'] = 1;
             }
 
-            if ( ! empty($args['user_id']) ) {
+            if ( ! empty( $args['user_id'] ) ) {
                 $where['e.user_id'] = $args['user_id'];
             }
-            $query[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+            $query[] = FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
 
 			if ( $args['group_by'] ) {
-				$query[] = ' GROUP BY '. sanitize_text_field( $args['group_by'] );
+				$query[] = ' GROUP BY ' . sanitize_text_field( $args['group_by'] );
 			}
             return;
         }
@@ -329,27 +329,27 @@ 
 			$draft_where = $wpdb->prepare( ' AND e.is_draft=%d', 1 );
         }
 
-        if ( ! empty($args['user_id']) ) {
-            $user_where = $wpdb->prepare(' AND e.user_id=%d', $args['user_id']);
+        if ( ! empty( $args['user_id'] ) ) {
+            $user_where = $wpdb->prepare( ' AND e.user_id=%d', $args['user_id'] );
         }
 
-        if ( strpos($where, ' GROUP BY ') ) {
+        if ( strpos( $where, ' GROUP BY ' ) ) {
             // don't inject WHERE filtering after GROUP BY
-            $parts = explode(' GROUP BY ', $where);
+            $parts = explode( ' GROUP BY ', $where );
             $where = $parts[0];
             $where .= $draft_where . $user_where;
-            $where .= ' GROUP BY '. $parts[1];
+            $where .= ' GROUP BY ' . $parts[1];
         } else {
             $where .= $draft_where . $user_where;
         }
 
 		// The query has already been prepared
-		$query[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+		$query[] = FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
     }
 
     public static function search_entry_metas( $search, $field_id = '', $operator ) {
-        $cache_key = 'search_'. maybe_serialize($search) . $field_id . $operator;
-        $results = wp_cache_get($cache_key, 'frm_entry');
+        $cache_key = 'search_' . maybe_serialize( $search ) . $field_id . $operator;
+        $results = wp_cache_get( $cache_key, 'frm_entry' );
         if ( false !== $results ) {
             return $results;
         }
@@ -364,27 +364,27 @@ 
 
                 switch ( $field ) {
                     case 'year':
-                        $value = '%'. $value;
+                        $value = '%' . $value;
                     break;
                     case 'month':
                         $value .= '%';
                     break;
                     case 'day':
-                        $value = '%'. $value .'%';
+                        $value = '%' . $value . '%';
                 }
-                $where .= $wpdb->prepare(' meta_value '. $operator .' %s and', $value);
+                $where .= $wpdb->prepare( ' meta_value ' . $operator . ' %s and', $value );
             }
-            $where .= $wpdb->prepare(' field_id=%d', $field_id);
-            $query = "SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas". FrmAppHelper::prepend_and_or_where(' WHERE ', $where);
+            $where .= $wpdb->prepare( ' field_id=%d', $field_id );
+            $query = "SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas" . FrmAppHelper::prepend_and_or_where( ' WHERE ', $where );
         } else {
 			if ( $operator == 'LIKE' ) {
                 $search = '%' . $search . '%';
 			}
-            $query = $wpdb->prepare("SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas WHERE meta_value {$operator} %s and field_id = %d", $search, $field_id);
+            $query = $wpdb->prepare( "SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas WHERE meta_value {$operator} %s and field_id = %d", $search, $field_id );
         }
 
-        $results = $wpdb->get_col($query, 0);
-        wp_cache_set($cache_key, $results, 'frm_entry', 300);
+        $results = $wpdb->get_col( $query, 0 );
+        wp_cache_set( $cache_key, $results, 'frm_entry', 300 );
 
         return $results;
     }

classes/models/FrmStyle.php

Doc Comments +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 	public $id = 0; // the id of the post
 
 	/**
-	 * @param int|string $id The id of the stylsheet or 'default'
+	 * @param integer $id The id of the stylsheet or 'default'
 	 */
 	public function __construct( $id = 0 ) {
         $this->id = $id;

Indentation +314 added lines, -314 removed lines

@@ -1,52 +1,52 @@ 
 <?php
 class FrmStyle {
-    public $number = false;	// Unique ID number of the current instance.
+	public $number = false;	// Unique ID number of the current instance.
 	public $id = 0; // the id of the post
 
 	/**
 	 * @param int|string $id The id of the stylsheet or 'default'
 	 */
 	public function __construct( $id = 0 ) {
-        $this->id = $id;
-    }
+		$this->id = $id;
+	}
 
-    public function get_new() {
+	public function get_new() {
 		$this->id = 0;
 
-        $max_slug_value = pow(36, 6);
-        $min_slug_value = 37; // we want to have at least 2 characters in the slug
-        $key = base_convert( rand($min_slug_value, $max_slug_value), 10, 36 );
-
-        $style = array(
-            'post_type'     => FrmStylesController::$post_type,
-            'ID'            => '',
-            'post_title'    => __( 'New Style', 'formidable' ),
-            'post_name'     => $key,
-            'post_content'  => $this->get_defaults(),
-            'menu_order'    => '',
-            'post_status'   => 'publish',
-        );
+		$max_slug_value = pow(36, 6);
+		$min_slug_value = 37; // we want to have at least 2 characters in the slug
+		$key = base_convert( rand($min_slug_value, $max_slug_value), 10, 36 );
+
+		$style = array(
+			'post_type'     => FrmStylesController::$post_type,
+			'ID'            => '',
+			'post_title'    => __( 'New Style', 'formidable' ),
+			'post_name'     => $key,
+			'post_content'  => $this->get_defaults(),
+			'menu_order'    => '',
+			'post_status'   => 'publish',
+		);
 
-        return (object) $style;
-    }
+		return (object) $style;
+	}
 
 	public function save( $settings ) {
 		return FrmAppHelper::save_settings( $settings, 'frm_styles' );
-    }
+	}
 
 	public function duplicate( $id ) {
-        // duplicating is a pro feature
-    }
+		// duplicating is a pro feature
+	}
 
-    public function update( $id = 'default' ) {
+	public function update( $id = 'default' ) {
  		$all_instances = $this->get_all();
 
  		if ( empty($id) ) {
- 		     $new_style = (array) $this->get_new();
- 		     $all_instances[] = $new_style;
+ 			 $new_style = (array) $this->get_new();
+ 			 $all_instances[] = $new_style;
  		}
 
-        $action_ids = array();
+		$action_ids = array();
 
  		foreach ( $all_instances as $number => $new_instance ) {
  			$new_instance = stripslashes_deep( (array) $new_instance);
@@ -54,40 +54,40 @@ 
  			if ( $id != $this->id || ! $_POST || ! isset($_POST['frm_style_setting']) ) {
 				$all_instances[ $number ] = $new_instance;
 
- 			    if ( $new_instance['menu_order'] && $_POST && empty($_POST['prev_menu_order']) && isset($_POST['frm_style_setting']['menu_order']) ) {
- 			        // this style was set to default, so remove default setting on previous default style
- 			        $new_instance['menu_order'] = 0;
- 			        $action_ids[] = $this->save($new_instance);
- 			    }
+ 				if ( $new_instance['menu_order'] && $_POST && empty($_POST['prev_menu_order']) && isset($_POST['frm_style_setting']['menu_order']) ) {
+ 					// this style was set to default, so remove default setting on previous default style
+ 					$new_instance['menu_order'] = 0;
+ 					$action_ids[] = $this->save($new_instance);
+ 				}
 
- 			    // don't continue if not saving this style
- 			    continue;
+ 				// don't continue if not saving this style
+ 				continue;
  			}
 
  			$new_instance['post_title'] = sanitize_text_field( $_POST['frm_style_setting']['post_title'] );
  			$new_instance['post_content'] = $_POST['frm_style_setting']['post_content'];
  			$new_instance['post_type']  = FrmStylesController::$post_type;
-            $new_instance['post_status']  = 'publish';
+			$new_instance['post_status']  = 'publish';
 			$new_instance['menu_order']  = isset( $_POST['frm_style_setting']['menu_order'] ) ? absint( $_POST['frm_style_setting']['menu_order'] ) : 0;
 
-            if ( empty($id) ) {
-                $new_instance['post_name'] = $new_instance['post_title'];
-            }
+			if ( empty($id) ) {
+				$new_instance['post_name'] = $new_instance['post_title'];
+			}
 
-            $default_settings = $this->get_defaults();
+			$default_settings = $this->get_defaults();
 
-            foreach ( $default_settings as $setting => $default ) {
+			foreach ( $default_settings as $setting => $default ) {
 				if ( strpos( $setting, 'color' ) !== false || in_array( $setting, array( 'error_bg', 'error_border', 'error_text' ) ) ) {
-                    //if is a color
+					//if is a color
 					$new_instance['post_content'][ $setting ] = str_replace( '#', '', $new_instance['post_content'][ $setting ] );
 				} else if ( in_array( $setting, array( 'submit_style', 'important_style', 'auto_width' ) ) && ! isset( $new_instance['post_content'][ $setting ] ) ) {
 					$new_instance['post_content'][ $setting ] = 0;
-                }
-            }
+				}
+			}
 
 			$all_instances[ $number ] = $new_instance;
 
-            $action_ids[] = $this->save($new_instance);
+			$action_ids[] = $this->save($new_instance);
 
  		}
 
@@ -96,74 +96,74 @@ 
  		return $action_ids;
  	}
 
-    /**
-     * Create static css file
-     */
+	/**
+	 * Create static css file
+	 */
 	public function save_settings( $styles ) {
-        $filename = FrmAppHelper::plugin_path() .'/css/custom_theme.css.php';
+		$filename = FrmAppHelper::plugin_path() .'/css/custom_theme.css.php';
 
-        if ( ! is_file($filename) ) {
-            return;
-        }
+		if ( ! is_file($filename) ) {
+			return;
+		}
 
-        $defaults = $this->get_defaults();
-        $uploads = wp_upload_dir();
-        $target_path = $uploads['basedir'] .'/formidable';
-        $needed_dirs = array( $target_path, $target_path .'/css' );
-        $dirs_exist = true;
+		$defaults = $this->get_defaults();
+		$uploads = wp_upload_dir();
+		$target_path = $uploads['basedir'] .'/formidable';
+		$needed_dirs = array( $target_path, $target_path .'/css' );
+		$dirs_exist = true;
 
-        $saving = true;
-        $css = '/* '. __( 'WARNING: Any changes made to this file will be lost when your Formidable settings are updated', 'formidable' ) .' */'. "\n";
+		$saving = true;
+		$css = '/* '. __( 'WARNING: Any changes made to this file will be lost when your Formidable settings are updated', 'formidable' ) .' */'. "\n";
 
-        ob_start();
-        $frm_style = $this;
-        include($filename);
+		ob_start();
+		$frm_style = $this;
+		include($filename);
 		$css .= preg_replace( '/\/\*(.|\s)*?\*\//', '', str_replace( array( "\r\n", "\r", "\n", "\t", '    ' ), '', ob_get_contents() ) );
-        ob_end_clean();
+		ob_end_clean();
 
-        $access_type = get_filesystem_method();
-        if ( $access_type === 'direct' ) {
-        	$creds = request_filesystem_credentials( site_url() .'/wp-admin/', '', false, false, array() );
+		$access_type = get_filesystem_method();
+		if ( $access_type === 'direct' ) {
+			$creds = request_filesystem_credentials( site_url() .'/wp-admin/', '', false, false, array() );
 		} else {
 			$creds = $this->get_ftp_creds( $access_type );
 		}
 
 		if ( ! empty( $creds ) ) {
-        	// initialize the API
-        	if ( ! WP_Filesystem( $creds ) ) {
-        		// any problems and we exit
-        		$dirs_exist = false;
+			// initialize the API
+			if ( ! WP_Filesystem( $creds ) ) {
+				// any problems and we exit
+				$dirs_exist = false;
 			}
 
-            if ( $dirs_exist ) {
-	        	global $wp_filesystem;
+			if ( $dirs_exist ) {
+				global $wp_filesystem;
 
-            	$chmod_dir = defined('FS_CHMOD_DIR') ? FS_CHMOD_DIR : ( fileperms( ABSPATH ) & 0777 | 0755 );
-            	$chmod_file = defined('FS_CHMOD_FILE') ? FS_CHMOD_FILE : ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 );
+				$chmod_dir = defined('FS_CHMOD_DIR') ? FS_CHMOD_DIR : ( fileperms( ABSPATH ) & 0777 | 0755 );
+				$chmod_file = defined('FS_CHMOD_FILE') ? FS_CHMOD_FILE : ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 );
 
-                // Create the directories if need be:
-            	foreach ( $needed_dirs as $_dir ) {
-                    // Only check to see if the Dir exists upon creation failure. Less I/O this way.
-            		if ( ! $wp_filesystem->mkdir( $_dir, $chmod_dir ) && ! $wp_filesystem->is_dir( $_dir ) ) {
-            			$dirs_exist = false;
-                    }
-            	}
+				// Create the directories if need be:
+				foreach ( $needed_dirs as $_dir ) {
+					// Only check to see if the Dir exists upon creation failure. Less I/O this way.
+					if ( ! $wp_filesystem->mkdir( $_dir, $chmod_dir ) && ! $wp_filesystem->is_dir( $_dir ) ) {
+						$dirs_exist = false;
+					}
+				}
 
-                $index_path = $target_path .'/index.php';
-                $wp_filesystem->put_contents( $index_path, "<?php\n// Silence is golden.\n?>", $chmod_file );
+				$index_path = $target_path .'/index.php';
+				$wp_filesystem->put_contents( $index_path, "<?php\n// Silence is golden.\n?>", $chmod_file );
 
-                // only write the file if the folders exist
-                if ( $dirs_exist ) {
-                    $css_file = $target_path .'/css/formidablepro.css';
-                    $wp_filesystem->put_contents( $css_file, $css, $chmod_file );
-                }
-            }
-        }
+				// only write the file if the folders exist
+				if ( $dirs_exist ) {
+					$css_file = $target_path .'/css/formidablepro.css';
+					$wp_filesystem->put_contents( $css_file, $css, $chmod_file );
+				}
+			}
+		}
 
-        update_option('frmpro_css', $css);
+		update_option('frmpro_css', $css);
 
-        delete_transient('frmpro_css');
-        set_transient('frmpro_css', $css);
+		delete_transient('frmpro_css');
+		set_transient('frmpro_css', $css);
 	}
 
 	private function get_ftp_creds( $type ) {
@@ -217,271 +217,271 @@ 
 	}
 
 	public function destroy( $id ) {
-        return wp_delete_post($id);
-    }
+		return wp_delete_post($id);
+	}
 
-    public function get_one() {
-        if ( 'default' == $this->id ) {
-            $style = $this->get_default_style();
-            if ( $style ) {
-                $this->id = $style->ID;
-            } else {
-                $this->id = 0;
-            }
-            return $style;
-        }
+	public function get_one() {
+		if ( 'default' == $this->id ) {
+			$style = $this->get_default_style();
+			if ( $style ) {
+				$this->id = $style->ID;
+			} else {
+				$this->id = 0;
+			}
+			return $style;
+		}
 
-        $style = get_post($this->id);
+		$style = get_post($this->id);
 
-        if ( ! $style ) {
-            return $style;
-        }
+		if ( ! $style ) {
+			return $style;
+		}
 
-        $style->post_content = FrmAppHelper::maybe_json_decode($style->post_content);
+		$style->post_content = FrmAppHelper::maybe_json_decode($style->post_content);
 
-        $default_values = $this->get_defaults();
+		$default_values = $this->get_defaults();
 
-        // fill default values
-        $style->post_content = $this->override_defaults($style->post_content);
-        $style->post_content = wp_parse_args( $style->post_content, $default_values);
+		// fill default values
+		$style->post_content = $this->override_defaults($style->post_content);
+		$style->post_content = wp_parse_args( $style->post_content, $default_values);
 
-        return $style;
-    }
+		return $style;
+	}
 
-    public function get_all( $orderby = 'title', $order = 'ASC', $limit = 99 ) {
-        $post_atts = array(
+	public function get_all( $orderby = 'title', $order = 'ASC', $limit = 99 ) {
+		$post_atts = array(
 			'post_type'   => FrmStylesController::$post_type,
 			'post_status' => 'publish',
 			'numberposts' => $limit,
 			'orderby'     => $orderby,
 			'order'       => $order,
-        );
-
-        $temp_styles = FrmAppHelper::check_cache(serialize($post_atts), 'frm_styles', $post_atts, 'get_posts');
-
-        if ( empty($temp_styles) ) {
-            global $wpdb;
-            // make sure there wasn't a conflict with the query
-            $query = $wpdb->prepare('SELECT * FROM '. $wpdb->posts .' WHERE post_type=%s AND post_status=%s ORDER BY post_title ASC LIMIT 99', FrmStylesController::$post_type, 'publish');
-            $temp_styles = FrmAppHelper::check_cache('frm_backup_style_check', 'frm_styles', $query, 'get_results');
-
-            if ( empty($temp_styles) ) {
-                // create a new style if there are none
-         		$new = $this->get_new();
-         		$new->post_title = $new->post_name = __( 'Formidable Style', 'formidable' );
-         		$new->menu_order = 1;
-         		$new = $this->save( (array) $new);
-         		$this->update('default');
-
-                $post_atts['include'] = $new;
-
-                $temp_styles = get_posts( $post_atts );
-            }
-        }
-
-        $default_values = $this->get_defaults();
-        $default_style = false;
-
-        $styles = array();
-        foreach ( $temp_styles as $style ) {
-            $this->id = $style->ID;
-            if ( $style->menu_order ) {
-                if ( $default_style ) {
-                    // only return one default
-                    $style->menu_order = 0;
-                } else {
-                    // check for a default style
-                    $default_style = $style->ID;
-                }
-            }
-
-            $style->post_content = FrmAppHelper::maybe_json_decode($style->post_content);
-
-            // fill default values
-            $style->post_content = $this->override_defaults($style->post_content);
-            $style->post_content = wp_parse_args( $style->post_content, $default_values);
+		);
+
+		$temp_styles = FrmAppHelper::check_cache(serialize($post_atts), 'frm_styles', $post_atts, 'get_posts');
+
+		if ( empty($temp_styles) ) {
+			global $wpdb;
+			// make sure there wasn't a conflict with the query
+			$query = $wpdb->prepare('SELECT * FROM '. $wpdb->posts .' WHERE post_type=%s AND post_status=%s ORDER BY post_title ASC LIMIT 99', FrmStylesController::$post_type, 'publish');
+			$temp_styles = FrmAppHelper::check_cache('frm_backup_style_check', 'frm_styles', $query, 'get_results');
+
+			if ( empty($temp_styles) ) {
+				// create a new style if there are none
+		 		$new = $this->get_new();
+		 		$new->post_title = $new->post_name = __( 'Formidable Style', 'formidable' );
+		 		$new->menu_order = 1;
+		 		$new = $this->save( (array) $new);
+		 		$this->update('default');
+
+				$post_atts['include'] = $new;
+
+				$temp_styles = get_posts( $post_atts );
+			}
+		}
+
+		$default_values = $this->get_defaults();
+		$default_style = false;
+
+		$styles = array();
+		foreach ( $temp_styles as $style ) {
+			$this->id = $style->ID;
+			if ( $style->menu_order ) {
+				if ( $default_style ) {
+					// only return one default
+					$style->menu_order = 0;
+				} else {
+					// check for a default style
+					$default_style = $style->ID;
+				}
+			}
+
+			$style->post_content = FrmAppHelper::maybe_json_decode($style->post_content);
+
+			// fill default values
+			$style->post_content = $this->override_defaults($style->post_content);
+			$style->post_content = wp_parse_args( $style->post_content, $default_values);
 
 			$styles[ $style->ID ] = $style;
-        }
+		}
 
-        if ( ! $default_style ) {
-            $default_style = reset($styles);
+		if ( ! $default_style ) {
+			$default_style = reset($styles);
 			$styles[ $default_style->ID ]->menu_order = 1;
-        }
+		}
 
-        return $styles;
-    }
+		return $styles;
+	}
 
 	public function get_default_style( $styles = null ) {
-        if ( ! isset($styles) ) {
+		if ( ! isset($styles) ) {
 			$styles = $this->get_all( 'menu_order', 'DESC', 1 );
-        }
+		}
 
-        foreach ( $styles as $style ) {
-            if ( $style->menu_order ) {
-                return $style;
-            }
-        }
-    }
+		foreach ( $styles as $style ) {
+			if ( $style->menu_order ) {
+				return $style;
+			}
+		}
+	}
 
 	public function override_defaults( $settings ) {
-	    if ( ! is_array($settings) ) {
-	        return $settings;
-	    }
-
-	    $settings['line_height'] = ( ! isset($settings['field_height']) || $settings['field_height'] == '' || $settings['field_height'] == 'auto') ? 'normal' : $settings['field_height'];
-
-	    if ( ! isset($settings['form_desc_size']) && isset($settings['description_font_size']) ) {
-	        $settings['form_desc_size'] = $settings['description_font_size'];
-	        $settings['form_desc_color'] = $settings['description_color'];
-	        $settings['title_color'] = $settings['label_color'];
-	    }
-
-	    if ( ! isset($settings['section_color']) && isset($settings['label_color']) ) {
-	        $settings['section_color'] = $settings['label_color'];
-	        $settings['section_border_color'] = $settings['border_color'];
-	    }
-
-	    if ( ! isset($settings['submit_hover_bg_color']) && isset($settings['submit_bg_color']) ) {
-	        $settings['submit_hover_bg_color'] = $settings['submit_bg_color'];
-	        $settings['submit_hover_color'] = $settings['submit_text_color'];
-	        $settings['submit_hover_border_color'] = $settings['submit_border_color'];
-
-	        $settings['submit_active_bg_color'] = $settings['submit_bg_color'];
-	        $settings['submit_active_color'] = $settings['submit_text_color'];
-            $settings['submit_active_border_color'] = $settings['submit_border_color'];
-	    }
-
-	    return $settings;
+		if ( ! is_array($settings) ) {
+			return $settings;
+		}
+
+		$settings['line_height'] = ( ! isset($settings['field_height']) || $settings['field_height'] == '' || $settings['field_height'] == 'auto') ? 'normal' : $settings['field_height'];
+
+		if ( ! isset($settings['form_desc_size']) && isset($settings['description_font_size']) ) {
+			$settings['form_desc_size'] = $settings['description_font_size'];
+			$settings['form_desc_color'] = $settings['description_color'];
+			$settings['title_color'] = $settings['label_color'];
+		}
+
+		if ( ! isset($settings['section_color']) && isset($settings['label_color']) ) {
+			$settings['section_color'] = $settings['label_color'];
+			$settings['section_border_color'] = $settings['border_color'];
+		}
+
+		if ( ! isset($settings['submit_hover_bg_color']) && isset($settings['submit_bg_color']) ) {
+			$settings['submit_hover_bg_color'] = $settings['submit_bg_color'];
+			$settings['submit_hover_color'] = $settings['submit_text_color'];
+			$settings['submit_hover_border_color'] = $settings['submit_border_color'];
+
+			$settings['submit_active_bg_color'] = $settings['submit_bg_color'];
+			$settings['submit_active_color'] = $settings['submit_text_color'];
+			$settings['submit_active_border_color'] = $settings['submit_border_color'];
+		}
+
+		return $settings;
 	}
 
 	public function get_defaults() {
-        return array(
-            'theme_css'         => 'ui-lightness',
-            'theme_name'        => 'UI Lightness',
+		return array(
+			'theme_css'         => 'ui-lightness',
+			'theme_name'        => 'UI Lightness',
 
 			'center_form'		=> '',
-            'form_width'        => '100%',
-            'form_align'        => 'left',
-            'direction'         => is_rtl() ? 'rtl' : 'ltr',
-            'fieldset'          => '0px',
-            'fieldset_color'    => '000000',
-            'fieldset_padding'  => '0 0 15px 0',
-            'fieldset_bg_color' => '',
-
-            'title_size'        => '20px',
-            'title_color'       => '444444',
+			'form_width'        => '100%',
+			'form_align'        => 'left',
+			'direction'         => is_rtl() ? 'rtl' : 'ltr',
+			'fieldset'          => '0px',
+			'fieldset_color'    => '000000',
+			'fieldset_padding'  => '0 0 15px 0',
+			'fieldset_bg_color' => '',
+
+			'title_size'        => '20px',
+			'title_color'       => '444444',
 			'title_margin_top'  => '10px',
 			'title_margin_bottom' => '10px',
-            'form_desc_size'    => '14px',
-            'form_desc_color'   => '666666',
+			'form_desc_size'    => '14px',
+			'form_desc_color'   => '666666',
 			'form_desc_margin_top' => '10px',
 			'form_desc_margin_bottom' => '25px',
 
-            'font'              => '"Lucida Grande","Lucida Sans Unicode",Tahoma,sans-serif',
-            'font_size'         => '14px',
-            'label_color'       => '444444',
-            'weight'            => 'bold',
-            'position'          => 'none',
-            'align'             => 'left',
-            'width'             => '150px',
-            'required_color'    => 'B94A48',
-            'required_weight'   => 'bold',
-            'label_padding'     => '0 0 3px 0',
-
-            'description_font_size' => '12px',
-            'description_color' => '666666',
-            'description_weight' => 'normal',
-            'description_style' => 'normal',
-            'description_align' => 'left',
-
-            'field_font_size'   => '14px',
-            'field_height' 		=> '32px',
-            'line_height'		=> 'normal',
-            'field_width'       => '100%',
-            'auto_width'        => false,
-            'field_pad'         => '6px 10px',
-            'field_margin'      => '20px',
+			'font'              => '"Lucida Grande","Lucida Sans Unicode",Tahoma,sans-serif',
+			'font_size'         => '14px',
+			'label_color'       => '444444',
+			'weight'            => 'bold',
+			'position'          => 'none',
+			'align'             => 'left',
+			'width'             => '150px',
+			'required_color'    => 'B94A48',
+			'required_weight'   => 'bold',
+			'label_padding'     => '0 0 3px 0',
+
+			'description_font_size' => '12px',
+			'description_color' => '666666',
+			'description_weight' => 'normal',
+			'description_style' => 'normal',
+			'description_align' => 'left',
+
+			'field_font_size'   => '14px',
+			'field_height' 		=> '32px',
+			'line_height'		=> 'normal',
+			'field_width'       => '100%',
+			'auto_width'        => false,
+			'field_pad'         => '6px 10px',
+			'field_margin'      => '20px',
 			'field_weight' => 'normal',
-            'text_color'        => '555555',
-            //'border_color_hv'   => 'cccccc',
-            'border_color'      => 'cccccc',
-            'field_border_width' => '1px',
-            'field_border_style' => 'solid',
-
-            'bg_color'          => 'ffffff',
-            //'bg_color_hv'       => 'ffffff',
+			'text_color'        => '555555',
+			//'border_color_hv'   => 'cccccc',
+			'border_color'      => 'cccccc',
+			'field_border_width' => '1px',
+			'field_border_style' => 'solid',
+
+			'bg_color'          => 'ffffff',
+			//'bg_color_hv'       => 'ffffff',
 			'remove_box_shadow' => '',
-            'bg_color_active'   => 'ffffff',
+			'bg_color_active'   => 'ffffff',
 			'border_color_active' => '66afe9',
 			'remove_box_shadow_active' => '',
-            'text_color_error'  => '444444',
-            'bg_color_error'    => 'ffffff',
+			'text_color_error'  => '444444',
+			'bg_color_error'    => 'ffffff',
 			'border_color_error' => 'B94A48',
 			'border_width_error' => '1px',
 			'border_style_error' => 'solid',
-            'bg_color_disabled' => 'ffffff',
-            'border_color_disabled' => 'E5E5E5',
-            'text_color_disabled' => 'A1A1A1',
-
-            'radio_align'       => 'block',
-            'check_align'       => 'block',
-            'check_font_size'   => '13px',
-            'check_label_color' => '444444',
-            'check_weight'      => 'normal',
-
-            'section_font_size' => '18px',
-            'section_color'     => '444444',
-            'section_weight'    => 'bold',
-            'section_pad'       => '15px 0 3px 0',
-            'section_mar_top'   => '15px',
+			'bg_color_disabled' => 'ffffff',
+			'border_color_disabled' => 'E5E5E5',
+			'text_color_disabled' => 'A1A1A1',
+
+			'radio_align'       => 'block',
+			'check_align'       => 'block',
+			'check_font_size'   => '13px',
+			'check_label_color' => '444444',
+			'check_weight'      => 'normal',
+
+			'section_font_size' => '18px',
+			'section_color'     => '444444',
+			'section_weight'    => 'bold',
+			'section_pad'       => '15px 0 3px 0',
+			'section_mar_top'   => '15px',
 			'section_mar_bottom' => '12px',
-            'section_bg_color'  => '',
-            'section_border_color' => 'e8e8e8',
-            'section_border_width' => '2px',
-            'section_border_style' => 'solid',
-            'section_border_loc' => '-top',
-            'collapse_icon'     => '6',
-            'collapse_pos'      => 'after',
-            'repeat_icon'       => '1',
-
-            'submit_style'      => false,
-            'submit_font_size'  => '14px',
-            'submit_width'      => 'auto',
-            'submit_height'     => 'auto',
-            'submit_bg_color'   => 'ffffff',
-            'submit_border_color' => 'cccccc',
-            'submit_border_width' => '1px',
-            'submit_text_color' => '444444',
-            'submit_weight'     => 'normal',
-            'submit_border_radius' => '4px',
-            'submit_bg_img'     => '',
-            'submit_margin'     => '10px',
-            'submit_padding'    => '6px 11px',
-            'submit_shadow_color' => 'eeeeee',
-            'submit_hover_bg_color' => 'efefef',
-            'submit_hover_color' => '444444',
-            'submit_hover_border_color' => 'cccccc',
-            'submit_active_bg_color' => 'efefef',
-            'submit_active_color' => '444444',
-            'submit_active_border_color' => 'cccccc',
-
-            'border_radius'     => '4px',
-            'error_bg'          => 'F2DEDE',
-            'error_border'      => 'EBCCD1',
-            'error_text'        => 'B94A48',
-            'error_font_size'   => '14px',
-
-            'success_bg_color'  => 'DFF0D8',
-            'success_border_color' => 'D6E9C6',
-            'success_text_color' => '468847',
-            'success_font_size' => '14px',
-
-            'important_style'   => false,
-
-            'custom_css'        => '',
-        );
-    }
+			'section_bg_color'  => '',
+			'section_border_color' => 'e8e8e8',
+			'section_border_width' => '2px',
+			'section_border_style' => 'solid',
+			'section_border_loc' => '-top',
+			'collapse_icon'     => '6',
+			'collapse_pos'      => 'after',
+			'repeat_icon'       => '1',
+
+			'submit_style'      => false,
+			'submit_font_size'  => '14px',
+			'submit_width'      => 'auto',
+			'submit_height'     => 'auto',
+			'submit_bg_color'   => 'ffffff',
+			'submit_border_color' => 'cccccc',
+			'submit_border_width' => '1px',
+			'submit_text_color' => '444444',
+			'submit_weight'     => 'normal',
+			'submit_border_radius' => '4px',
+			'submit_bg_img'     => '',
+			'submit_margin'     => '10px',
+			'submit_padding'    => '6px 11px',
+			'submit_shadow_color' => 'eeeeee',
+			'submit_hover_bg_color' => 'efefef',
+			'submit_hover_color' => '444444',
+			'submit_hover_border_color' => 'cccccc',
+			'submit_active_bg_color' => 'efefef',
+			'submit_active_color' => '444444',
+			'submit_active_border_color' => 'cccccc',
+
+			'border_radius'     => '4px',
+			'error_bg'          => 'F2DEDE',
+			'error_border'      => 'EBCCD1',
+			'error_text'        => 'B94A48',
+			'error_font_size'   => '14px',
+
+			'success_bg_color'  => 'DFF0D8',
+			'success_border_color' => 'D6E9C6',
+			'success_text_color' => '468847',
+			'success_font_size' => '14px',
+
+			'important_style'   => false,
+
+			'custom_css'        => '',
+		);
+	}
 
 	public function get_field_name( $field_name, $post_field = 'post_content' ) {
 		return 'frm_style_setting'. ( empty($post_field) ? '' : '['. $post_field .']' ) .'[' . $field_name . ']';

Spacing +62 added lines, -62 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 class FrmStyle {
-    public $number = false;	// Unique ID number of the current instance.
+    public $number = false; // Unique ID number of the current instance.
 	public $id = 0; // the id of the post
 
 	/**
@@ -13,9 +13,9 @@ 
     public function get_new() {
 		$this->id = 0;
 
-        $max_slug_value = pow(36, 6);
+        $max_slug_value = pow( 36, 6 );
         $min_slug_value = 37; // we want to have at least 2 characters in the slug
-        $key = base_convert( rand($min_slug_value, $max_slug_value), 10, 36 );
+        $key = base_convert( rand( $min_slug_value, $max_slug_value ), 10, 36 );
 
         $style = array(
             'post_type'     => FrmStylesController::$post_type,
@@ -41,7 +41,7 @@ 
     public function update( $id = 'default' ) {
  		$all_instances = $this->get_all();
 
- 		if ( empty($id) ) {
+ 		if ( empty( $id ) ) {
  		     $new_style = (array) $this->get_new();
  		     $all_instances[] = $new_style;
  		}
@@ -49,15 +49,15 @@ 
         $action_ids = array();
 
  		foreach ( $all_instances as $number => $new_instance ) {
- 			$new_instance = stripslashes_deep( (array) $new_instance);
+ 			$new_instance = stripslashes_deep( (array) $new_instance );
  			$this->id = $new_instance['ID'];
- 			if ( $id != $this->id || ! $_POST || ! isset($_POST['frm_style_setting']) ) {
-				$all_instances[ $number ] = $new_instance;
+ 			if ( $id != $this->id || ! $_POST || ! isset( $_POST['frm_style_setting'] ) ) {
+				$all_instances[$number] = $new_instance;
 
- 			    if ( $new_instance['menu_order'] && $_POST && empty($_POST['prev_menu_order']) && isset($_POST['frm_style_setting']['menu_order']) ) {
+ 			    if ( $new_instance['menu_order'] && $_POST && empty( $_POST['prev_menu_order'] ) && isset( $_POST['frm_style_setting']['menu_order'] ) ) {
  			        // this style was set to default, so remove default setting on previous default style
  			        $new_instance['menu_order'] = 0;
- 			        $action_ids[] = $this->save($new_instance);
+ 			        $action_ids[] = $this->save( $new_instance );
  			    }
 
  			    // don't continue if not saving this style
@@ -67,10 +67,10 @@ 
  			$new_instance['post_title'] = sanitize_text_field( $_POST['frm_style_setting']['post_title'] );
  			$new_instance['post_content'] = $_POST['frm_style_setting']['post_content'];
  			$new_instance['post_type']  = FrmStylesController::$post_type;
-            $new_instance['post_status']  = 'publish';
+            $new_instance['post_status'] = 'publish';
 			$new_instance['menu_order']  = isset( $_POST['frm_style_setting']['menu_order'] ) ? absint( $_POST['frm_style_setting']['menu_order'] ) : 0;
 
-            if ( empty($id) ) {
+            if ( empty( $id ) ) {
                 $new_instance['post_name'] = $new_instance['post_title'];
             }
 
@@ -79,19 +79,19 @@ 
             foreach ( $default_settings as $setting => $default ) {
 				if ( strpos( $setting, 'color' ) !== false || in_array( $setting, array( 'error_bg', 'error_border', 'error_text' ) ) ) {
                     //if is a color
-					$new_instance['post_content'][ $setting ] = str_replace( '#', '', $new_instance['post_content'][ $setting ] );
-				} else if ( in_array( $setting, array( 'submit_style', 'important_style', 'auto_width' ) ) && ! isset( $new_instance['post_content'][ $setting ] ) ) {
-					$new_instance['post_content'][ $setting ] = 0;
+					$new_instance['post_content'][$setting] = str_replace( '#', '', $new_instance['post_content'][$setting] );
+				} else if ( in_array( $setting, array( 'submit_style', 'important_style', 'auto_width' ) ) && ! isset( $new_instance['post_content'][$setting] ) ) {
+					$new_instance['post_content'][$setting] = 0;
                 }
             }
 
-			$all_instances[ $number ] = $new_instance;
+			$all_instances[$number] = $new_instance;
 
-            $action_ids[] = $this->save($new_instance);
+            $action_ids[] = $this->save( $new_instance );
 
  		}
 
- 		$this->save_settings($all_instances);
+ 		$this->save_settings( $all_instances );
 
  		return $action_ids;
  	}
@@ -100,31 +100,31 @@ 
      * Create static css file
      */
 	public function save_settings( $styles ) {
-        $filename = FrmAppHelper::plugin_path() .'/css/custom_theme.css.php';
-		update_option( 'frm_last_style_update', date('njGi') );
+        $filename = FrmAppHelper::plugin_path() . '/css/custom_theme.css.php';
+		update_option( 'frm_last_style_update', date( 'njGi' ) );
 
-        if ( ! is_file($filename) ) {
+        if ( ! is_file( $filename ) ) {
             return;
         }
 
         $defaults = $this->get_defaults();
         $uploads = wp_upload_dir();
-        $target_path = $uploads['basedir'] .'/formidable';
-        $needed_dirs = array( $target_path, $target_path .'/css' );
+        $target_path = $uploads['basedir'] . '/formidable';
+        $needed_dirs = array( $target_path, $target_path . '/css' );
         $dirs_exist = true;
 
         $saving = true;
-        $css = '/* '. __( 'WARNING: Any changes made to this file will be lost when your Formidable settings are updated', 'formidable' ) .' */'. "\n";
+        $css = '/* ' . __( 'WARNING: Any changes made to this file will be lost when your Formidable settings are updated', 'formidable' ) . ' */' . "\n";
 
         ob_start();
         $frm_style = $this;
-        include($filename);
+        include( $filename );
 		$css .= preg_replace( '/\/\*(.|\s)*?\*\//', '', str_replace( array( "\r\n", "\r", "\n", "\t", '    ' ), '', ob_get_contents() ) );
         ob_end_clean();
 
         $access_type = get_filesystem_method();
         if ( $access_type === 'direct' ) {
-        	$creds = request_filesystem_credentials( site_url() .'/wp-admin/', '', false, false, array() );
+        	$creds = request_filesystem_credentials( site_url() . '/wp-admin/', '', false, false, array() );
 		} else {
 			$creds = $this->get_ftp_creds( $access_type );
 		}
@@ -139,8 +139,8 @@ 
             if ( $dirs_exist ) {
 	        	global $wp_filesystem;
 
-            	$chmod_dir = defined('FS_CHMOD_DIR') ? FS_CHMOD_DIR : ( fileperms( ABSPATH ) & 0777 | 0755 );
-            	$chmod_file = defined('FS_CHMOD_FILE') ? FS_CHMOD_FILE : ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 );
+            	$chmod_dir = defined( 'FS_CHMOD_DIR' ) ? FS_CHMOD_DIR : ( fileperms( ABSPATH ) & 0777 | 0755 );
+            	$chmod_file = defined( 'FS_CHMOD_FILE' ) ? FS_CHMOD_FILE : ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 );
 
                 // Create the directories if need be:
             	foreach ( $needed_dirs as $_dir ) {
@@ -150,33 +150,33 @@ 
                     }
             	}
 
-                $index_path = $target_path .'/index.php';
+                $index_path = $target_path . '/index.php';
                 $wp_filesystem->put_contents( $index_path, "<?php\n// Silence is golden.\n?>", $chmod_file );
 
                 // only write the file if the folders exist
                 if ( $dirs_exist ) {
-                    $css_file = $target_path .'/css/formidablepro.css';
+                    $css_file = $target_path . '/css/formidablepro.css';
                     $wp_filesystem->put_contents( $css_file, $css, $chmod_file );
                 }
             }
         }
 
-        update_option('frmpro_css', $css);
+        update_option( 'frmpro_css', $css );
 
-        delete_transient('frmpro_css');
-        set_transient('frmpro_css', $css);
+        delete_transient( 'frmpro_css' );
+        set_transient( 'frmpro_css', $css );
 	}
 
 	private function get_ftp_creds( $type ) {
 		$credentials = get_option( 'ftp_credentials', array( 'hostname' => '', 'username' => '' ) );
 
-		$credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : $credentials['hostname'];
-		$credentials['username'] = defined('FTP_USER') ? FTP_USER : $credentials['username'];
-		$credentials['password'] = defined('FTP_PASS') ? FTP_PASS : '';
+		$credentials['hostname'] = defined( 'FTP_HOST' ) ? FTP_HOST : $credentials['hostname'];
+		$credentials['username'] = defined( 'FTP_USER' ) ? FTP_USER : $credentials['username'];
+		$credentials['password'] = defined( 'FTP_PASS' ) ? FTP_PASS : '';
 
 		// Check to see if we are setting the public/private keys for ssh
-		$credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : '';
-		$credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : '';
+		$credentials['public_key'] = defined( 'FTP_PUBKEY' ) ? FTP_PUBKEY : '';
+		$credentials['private_key'] = defined( 'FTP_PRIKEY' ) ? FTP_PRIKEY : '';
 
 		// Sanitize the hostname, Some people might pass in odd-data:
 		$credentials['hostname'] = preg_replace( '|\w+://|', '', $credentials['hostname'] ); //Strip any schemes off
@@ -218,7 +218,7 @@ 
 	}
 
 	public function destroy( $id ) {
-        return wp_delete_post($id);
+        return wp_delete_post( $id );
     }
 
     public function get_one() {
@@ -232,19 +232,19 @@ 
             return $style;
         }
 
-        $style = get_post($this->id);
+        $style = get_post( $this->id );
 
         if ( ! $style ) {
             return $style;
         }
 
-        $style->post_content = FrmAppHelper::maybe_json_decode($style->post_content);
+        $style->post_content = FrmAppHelper::maybe_json_decode( $style->post_content );
 
         $default_values = $this->get_defaults();
 
         // fill default values
-        $style->post_content = $this->override_defaults($style->post_content);
-        $style->post_content = wp_parse_args( $style->post_content, $default_values);
+        $style->post_content = $this->override_defaults( $style->post_content );
+        $style->post_content = wp_parse_args( $style->post_content, $default_values );
 
         return $style;
     }
@@ -258,21 +258,21 @@ 
 			'order'       => $order,
         );
 
-        $temp_styles = FrmAppHelper::check_cache(serialize($post_atts), 'frm_styles', $post_atts, 'get_posts');
+        $temp_styles = FrmAppHelper::check_cache( serialize( $post_atts ), 'frm_styles', $post_atts, 'get_posts' );
 
-        if ( empty($temp_styles) ) {
+        if ( empty( $temp_styles ) ) {
             global $wpdb;
             // make sure there wasn't a conflict with the query
-            $query = $wpdb->prepare('SELECT * FROM '. $wpdb->posts .' WHERE post_type=%s AND post_status=%s ORDER BY post_title ASC LIMIT 99', FrmStylesController::$post_type, 'publish');
-            $temp_styles = FrmAppHelper::check_cache('frm_backup_style_check', 'frm_styles', $query, 'get_results');
+            $query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->posts . ' WHERE post_type=%s AND post_status=%s ORDER BY post_title ASC LIMIT 99', FrmStylesController::$post_type, 'publish' );
+            $temp_styles = FrmAppHelper::check_cache( 'frm_backup_style_check', 'frm_styles', $query, 'get_results' );
 
-            if ( empty($temp_styles) ) {
+            if ( empty( $temp_styles ) ) {
                 // create a new style if there are none
          		$new = $this->get_new();
          		$new->post_title = $new->post_name = __( 'Formidable Style', 'formidable' );
          		$new->menu_order = 1;
-         		$new = $this->save( (array) $new);
-         		$this->update('default');
+         		$new = $this->save( (array) $new );
+         		$this->update( 'default' );
 
                 $post_atts['include'] = $new;
 
@@ -296,25 +296,25 @@ 
                 }
             }
 
-            $style->post_content = FrmAppHelper::maybe_json_decode($style->post_content);
+            $style->post_content = FrmAppHelper::maybe_json_decode( $style->post_content );
 
             // fill default values
-            $style->post_content = $this->override_defaults($style->post_content);
-            $style->post_content = wp_parse_args( $style->post_content, $default_values);
+            $style->post_content = $this->override_defaults( $style->post_content );
+            $style->post_content = wp_parse_args( $style->post_content, $default_values );
 
-			$styles[ $style->ID ] = $style;
+			$styles[$style->ID] = $style;
         }
 
         if ( ! $default_style ) {
-            $default_style = reset($styles);
-			$styles[ $default_style->ID ]->menu_order = 1;
+            $default_style = reset( $styles );
+			$styles[$default_style->ID]->menu_order = 1;
         }
 
         return $styles;
     }
 
 	public function get_default_style( $styles = null ) {
-        if ( ! isset($styles) ) {
+        if ( ! isset( $styles ) ) {
 			$styles = $this->get_all( 'menu_order', 'DESC', 1 );
         }
 
@@ -326,24 +326,24 @@ 
     }
 
 	public function override_defaults( $settings ) {
-	    if ( ! is_array($settings) ) {
+	    if ( ! is_array( $settings ) ) {
 	        return $settings;
 	    }
 
-	    $settings['line_height'] = ( ! isset($settings['field_height']) || $settings['field_height'] == '' || $settings['field_height'] == 'auto') ? 'normal' : $settings['field_height'];
+	    $settings['line_height'] = ( ! isset( $settings['field_height'] ) || $settings['field_height'] == '' || $settings['field_height'] == 'auto' ) ? 'normal' : $settings['field_height'];
 
-	    if ( ! isset($settings['form_desc_size']) && isset($settings['description_font_size']) ) {
+	    if ( ! isset( $settings['form_desc_size'] ) && isset( $settings['description_font_size'] ) ) {
 	        $settings['form_desc_size'] = $settings['description_font_size'];
 	        $settings['form_desc_color'] = $settings['description_color'];
 	        $settings['title_color'] = $settings['label_color'];
 	    }
 
-	    if ( ! isset($settings['section_color']) && isset($settings['label_color']) ) {
+	    if ( ! isset( $settings['section_color'] ) && isset( $settings['label_color'] ) ) {
 	        $settings['section_color'] = $settings['label_color'];
 	        $settings['section_border_color'] = $settings['border_color'];
 	    }
 
-	    if ( ! isset($settings['submit_hover_bg_color']) && isset($settings['submit_bg_color']) ) {
+	    if ( ! isset( $settings['submit_hover_bg_color'] ) && isset( $settings['submit_bg_color'] ) ) {
 	        $settings['submit_hover_bg_color'] = $settings['submit_bg_color'];
 	        $settings['submit_hover_color'] = $settings['submit_text_color'];
 	        $settings['submit_hover_border_color'] = $settings['submit_border_color'];
@@ -485,7 +485,7 @@ 
     }
 
 	public function get_field_name( $field_name, $post_field = 'post_content' ) {
-		return 'frm_style_setting'. ( empty($post_field) ? '' : '['. $post_field .']' ) .'[' . $field_name . ']';
+		return 'frm_style_setting' . ( empty( $post_field ) ? '' : '[' . $post_field . ']' ) . '[' . $field_name . ']';
 	}
 
 	public static function get_bold_options() {

classes/controllers/FrmHooksController.php

Spacing +2 added lines, -2 removed lines

@@ -143,8 +143,8 @@
         add_action( 'wp_ajax_frm_deauthorize', 'FrmAppController::deauthorize' );
 
 		// Addons Controller
-		add_action('wp_ajax_frm_addon_activate', 'FrmAddon::activate' );
-		add_action('wp_ajax_frm_addon_deactivate', 'FrmAddon::deactivate' );
+		add_action( 'wp_ajax_frm_addon_activate', 'FrmAddon::activate' );
+		add_action( 'wp_ajax_frm_addon_deactivate', 'FrmAddon::deactivate' );
 
         // Fields Controller
         add_action( 'wp_ajax_frm_load_field', 'FrmFieldsController::load_field' );

Indentation +145 added lines, -145 removed lines

@@ -1,91 +1,91 @@ 
 <?php
 
 class FrmHooksController {
-    /**
-     * Trigger plugin-wide hook loading
-     */
-    public static function trigger_load_hook( $hooks = 'load_hooks' ) {
-        $controllers = apply_filters( 'frm_load_controllers', array( 'FrmHooksController' ) );
-
-        $trigger_hooks = $hooks;
-        $hooks = (array) $hooks;
-
-        if ( 'load_hooks' == $trigger_hooks ) {
-            if ( is_admin() ) {
-                $hooks[] = 'load_admin_hooks';
-                if ( defined( 'DOING_AJAX' ) ) {
-                    $hooks[] = 'load_ajax_hooks';
-                    $hooks[] = 'load_form_hooks';
-                }
-            }
-
-            if ( is_multisite() ) {
-                $hooks[] = 'load_multisite_hooks';
-            }
-        } else {
-            // Make sure the hooks are only triggered once
-            add_filter( 'frm' . str_replace( 'load', '', $trigger_hooks ) . '_loaded', '__return_true' );
-        }
-        unset( $trigger_hooks );
-
-        // Instansiate Controllers
-        foreach ( $controllers as $c ) {
-            foreach ( $hooks as $hook ) {
+	/**
+	 * Trigger plugin-wide hook loading
+	 */
+	public static function trigger_load_hook( $hooks = 'load_hooks' ) {
+		$controllers = apply_filters( 'frm_load_controllers', array( 'FrmHooksController' ) );
+
+		$trigger_hooks = $hooks;
+		$hooks = (array) $hooks;
+
+		if ( 'load_hooks' == $trigger_hooks ) {
+			if ( is_admin() ) {
+				$hooks[] = 'load_admin_hooks';
+				if ( defined( 'DOING_AJAX' ) ) {
+					$hooks[] = 'load_ajax_hooks';
+					$hooks[] = 'load_form_hooks';
+				}
+			}
+
+			if ( is_multisite() ) {
+				$hooks[] = 'load_multisite_hooks';
+			}
+		} else {
+			// Make sure the hooks are only triggered once
+			add_filter( 'frm' . str_replace( 'load', '', $trigger_hooks ) . '_loaded', '__return_true' );
+		}
+		unset( $trigger_hooks );
+
+		// Instansiate Controllers
+		foreach ( $controllers as $c ) {
+			foreach ( $hooks as $hook ) {
 				call_user_func( array( $c, $hook ) );
 				unset( $hook );
-            }
+			}
 			unset( $c );
-        }
+		}
 
-    }
+	}
 
-    public static function trigger_load_form_hooks() {
-        self::trigger_load_hook( 'load_form_hooks' );
-    }
+	public static function trigger_load_form_hooks() {
+		self::trigger_load_hook( 'load_form_hooks' );
+	}
 
 	public static function load_hooks() {
-        if ( ! is_admin() ) {
-            add_filter( 'the_content', 'FrmAppController::page_route', 10 );
-        }
-
-        add_action( 'plugins_loaded', 'FrmAppController::load_lang' );
-        add_filter( 'widget_text', 'FrmAppController::widget_text_filter', 8 );
-
-        // Entries controller
-        add_action( 'wp_loaded', 'FrmEntriesController::process_entry', 10, 0 );
-        add_filter( 'frm_redirect_url', 'FrmEntriesController::delete_entry_before_redirect', 50, 3 );
-        add_action( 'frm_after_entry_processed', 'FrmEntriesController::delete_entry_after_save', 100 );
-        add_filter( 'frm_email_value', 'FrmEntriesController::filter_email_value', 10, 3 );
-        add_filter( 'frmpro_fields_replace_shortcodes', 'FrmEntriesController::filter_shortcode_value', 10, 4 );
-
-        // Form Actions Controller
-        add_action( 'init', 'FrmFormActionsController::register_post_types', 1 );
+		if ( ! is_admin() ) {
+			add_filter( 'the_content', 'FrmAppController::page_route', 10 );
+		}
+
+		add_action( 'plugins_loaded', 'FrmAppController::load_lang' );
+		add_filter( 'widget_text', 'FrmAppController::widget_text_filter', 8 );
+
+		// Entries controller
+		add_action( 'wp_loaded', 'FrmEntriesController::process_entry', 10, 0 );
+		add_filter( 'frm_redirect_url', 'FrmEntriesController::delete_entry_before_redirect', 50, 3 );
+		add_action( 'frm_after_entry_processed', 'FrmEntriesController::delete_entry_after_save', 100 );
+		add_filter( 'frm_email_value', 'FrmEntriesController::filter_email_value', 10, 3 );
+		add_filter( 'frmpro_fields_replace_shortcodes', 'FrmEntriesController::filter_shortcode_value', 10, 4 );
+
+		// Form Actions Controller
+		add_action( 'init', 'FrmFormActionsController::register_post_types', 1 );
 		add_action( 'frm_after_create_entry', 'FrmFormActionsController::trigger_create_actions', 20, 3 );
 
-        // Forms Controller
-        add_action( 'widgets_init', 'FrmFormsController::register_widgets' );
+		// Forms Controller
+		add_action( 'widgets_init', 'FrmFormsController::register_widgets' );
 		add_action( 'init', 'FrmFormsController::front_head' );
-        add_filter( 'frm_content', 'FrmFormsController::filter_content', 10, 3 );
-        add_filter( 'frm_replace_content_shortcodes', 'FrmFormsController::replace_content_shortcodes', 20, 3 );
-        add_action( 'admin_bar_init', 'FrmFormsController::admin_bar_css' );
+		add_filter( 'frm_content', 'FrmFormsController::filter_content', 10, 3 );
+		add_filter( 'frm_replace_content_shortcodes', 'FrmFormsController::replace_content_shortcodes', 20, 3 );
+		add_action( 'admin_bar_init', 'FrmFormsController::admin_bar_css' );
 		add_action( 'wp_footer', 'FrmFormsController::footer_js', 1, 0 );
 
 		add_action( 'wp_scheduled_delete', 'FrmForm::scheduled_delete' );
 
-        // Form Shortcodes
-        add_shortcode( 'formidable', 'FrmFormsController::get_form_shortcode' );
+		// Form Shortcodes
+		add_shortcode( 'formidable', 'FrmFormsController::get_form_shortcode' );
 
-        // Styles Controller
-        add_action( 'init', 'FrmStylesController::register_post_types', 0 );
-        add_filter( 'frm_get_style_opts', 'FrmStylesController::get_style_opts' );
-        add_filter( 'frm_add_form_style_class', 'FrmStylesController::get_form_style_class', 10, 2 );
-        add_filter( 'frm_show_entry_styles', 'FrmStylesController::show_entry_styles' );
-    }
+		// Styles Controller
+		add_action( 'init', 'FrmStylesController::register_post_types', 0 );
+		add_filter( 'frm_get_style_opts', 'FrmStylesController::get_style_opts' );
+		add_filter( 'frm_add_form_style_class', 'FrmStylesController::get_form_style_class', 10, 2 );
+		add_filter( 'frm_show_entry_styles', 'FrmStylesController::show_entry_styles' );
+	}
 
 	public static function load_admin_hooks() {
-        add_action( 'admin_menu', 'FrmAppController::menu', 1 );
-        add_action( 'admin_enqueue_scripts', 'FrmAppController::load_wp_admin_style' );
-        add_action( 'admin_notices', 'FrmAppController::pro_get_started_headline' );
+		add_action( 'admin_menu', 'FrmAppController::menu', 1 );
+		add_action( 'admin_enqueue_scripts', 'FrmAppController::load_wp_admin_style' );
+		add_action( 'admin_notices', 'FrmAppController::pro_get_started_headline' );
 		add_action( 'admin_init', 'FrmAppController::admin_init', 11 );
 		add_filter( 'admin_body_class', 'FrmAppController::wp_admin_body_class' );
 		add_filter( 'plugin_action_links_' . FrmAppHelper::plugin_folder() . '/formidable.php', 'FrmAppController::settings_link' );
@@ -94,122 +94,122 @@ 
 		// Addons Controller
 		add_action( 'admin_menu', 'FrmAddonsController::menu', 100 );
 
-        // Entries Controller
-        add_action( 'admin_menu', 'FrmEntriesController::menu', 12 );
-        add_filter( 'contextual_help', 'FrmEntriesController::contextual_help', 10, 3 );
-        add_filter( 'set-screen-option', 'FrmEntriesController::save_per_page', 10, 3 );
-        add_filter( 'update_user_metadata', 'FrmEntriesController::check_hidden_cols', 10, 5 );
-        add_action( 'updated_user_meta', 'FrmEntriesController::update_hidden_cols', 10, 4 );
+		// Entries Controller
+		add_action( 'admin_menu', 'FrmEntriesController::menu', 12 );
+		add_filter( 'contextual_help', 'FrmEntriesController::contextual_help', 10, 3 );
+		add_filter( 'set-screen-option', 'FrmEntriesController::save_per_page', 10, 3 );
+		add_filter( 'update_user_metadata', 'FrmEntriesController::check_hidden_cols', 10, 5 );
+		add_action( 'updated_user_meta', 'FrmEntriesController::update_hidden_cols', 10, 4 );
 
-        // Fields Controller
-        add_filter( 'frm_display_field_options', 'FrmFieldsController::display_field_options' );
+		// Fields Controller
+		add_filter( 'frm_display_field_options', 'FrmFieldsController::display_field_options' );
 
-        // Form Actions Controller
-        if ( FrmAppHelper::is_admin_page( 'formidable' ) ) {
-            add_action( 'frm_before_update_form_settings', 'FrmFormActionsController::update_settings' );
-        }
-        add_action( 'frm_after_duplicate_form', 'FrmFormActionsController::duplicate_form_actions', 20, 3 );
+		// Form Actions Controller
+		if ( FrmAppHelper::is_admin_page( 'formidable' ) ) {
+			add_action( 'frm_before_update_form_settings', 'FrmFormActionsController::update_settings' );
+		}
+		add_action( 'frm_after_duplicate_form', 'FrmFormActionsController::duplicate_form_actions', 20, 3 );
 
-        // Forms Controller
-        add_action( 'admin_menu', 'FrmFormsController::menu', 10 );
-        add_action( 'admin_head-toplevel_page_formidable', 'FrmFormsController::head' );
+		// Forms Controller
+		add_action( 'admin_menu', 'FrmFormsController::menu', 10 );
+		add_action( 'admin_head-toplevel_page_formidable', 'FrmFormsController::head' );
 
-        add_filter( 'set-screen-option', 'FrmFormsController::save_per_page', 10, 3 );
-        add_action( 'admin_footer', 'FrmFormsController::insert_form_popup' );
+		add_filter( 'set-screen-option', 'FrmFormsController::save_per_page', 10, 3 );
+		add_action( 'admin_footer', 'FrmFormsController::insert_form_popup' );
 		add_action( 'media_buttons', 'FrmFormsController::insert_form_button' );
 
-        // Forms Model
-        add_action( 'frm_after_duplicate_form', 'FrmForm::after_duplicate', 10, 2 );
+		// Forms Model
+		add_action( 'frm_after_duplicate_form', 'FrmForm::after_duplicate', 10, 2 );
 
-        // Settings Controller
-        add_action( 'admin_menu', 'FrmSettingsController::menu', 45 );
-        add_action( 'frm_before_settings', 'FrmSettingsController::license_box' );
+		// Settings Controller
+		add_action( 'admin_menu', 'FrmSettingsController::menu', 45 );
+		add_action( 'frm_before_settings', 'FrmSettingsController::license_box' );
 
-        // Styles Controller
-        add_action( 'admin_menu', 'FrmStylesController::menu', 14 );
-        add_action( 'admin_init', 'FrmStylesController::admin_init' );
+		// Styles Controller
+		add_action( 'admin_menu', 'FrmStylesController::menu', 14 );
+		add_action( 'admin_init', 'FrmStylesController::admin_init' );
 
-        // XML Controller
-        add_action( 'admin_menu', 'FrmXMLController::menu', 41 );
-    }
+		// XML Controller
+		add_action( 'admin_menu', 'FrmXMLController::menu', 41 );
+	}
 
 	public static function load_ajax_hooks() {
 		add_action( 'wp_ajax_frm_silent_upgrade', 'FrmAppController::ajax_install' );
 		add_action( 'wp_ajax_nopriv_frm_silent_upgrade', 'FrmAppController::ajax_install' );
 		add_action( 'wp_ajax_frm_install', 'FrmAppController::ajax_install' );
-        add_action( 'wp_ajax_frm_uninstall', 'FrmAppController::uninstall' );
-        add_action( 'wp_ajax_frm_deauthorize', 'FrmAppController::deauthorize' );
+		add_action( 'wp_ajax_frm_uninstall', 'FrmAppController::uninstall' );
+		add_action( 'wp_ajax_frm_deauthorize', 'FrmAppController::deauthorize' );
 
 		// Addons Controller
 		add_action('wp_ajax_frm_addon_activate', 'FrmAddon::activate' );
 		add_action('wp_ajax_frm_addon_deactivate', 'FrmAddon::deactivate' );
 
-        // Fields Controller
-        add_action( 'wp_ajax_frm_load_field', 'FrmFieldsController::load_field' );
-        add_action( 'wp_ajax_frm_insert_field', 'FrmFieldsController::create' );
-        add_action( 'wp_ajax_frm_update_field_form_id', 'FrmFieldsController::update_form_id' );
-        add_action( 'wp_ajax_frm_field_name_in_place_edit', 'FrmFieldsController::edit_name' );
-        add_action( 'wp_ajax_frm_update_ajax_option', 'FrmFieldsController::update_ajax_option' );
-        add_action( 'wp_ajax_frm_duplicate_field', 'FrmFieldsController::duplicate' );
-        add_action( 'wp_ajax_frm_delete_field', 'FrmFieldsController::destroy' );
-        add_action( 'wp_ajax_frm_add_field_option', 'FrmFieldsController::add_option' );
-        add_action( 'wp_ajax_frm_field_option_ipe', 'FrmFieldsController::edit_option' );
-        add_action( 'wp_ajax_frm_delete_field_option', 'FrmFieldsController::delete_option' );
-        add_action( 'wp_ajax_frm_import_choices', 'FrmFieldsController::import_choices' );
-        add_action( 'wp_ajax_frm_import_options', 'FrmFieldsController::import_options' );
-        add_action( 'wp_ajax_frm_update_field_order', 'FrmFieldsController::update_order' );
-
-        // Form Actions Controller
-        add_action( 'wp_ajax_frm_add_form_action', 'FrmFormActionsController::add_form_action' );
-        add_action( 'wp_ajax_frm_form_action_fill', 'FrmFormActionsController::fill_action' );
-
-        // Forms Controller
+		// Fields Controller
+		add_action( 'wp_ajax_frm_load_field', 'FrmFieldsController::load_field' );
+		add_action( 'wp_ajax_frm_insert_field', 'FrmFieldsController::create' );
+		add_action( 'wp_ajax_frm_update_field_form_id', 'FrmFieldsController::update_form_id' );
+		add_action( 'wp_ajax_frm_field_name_in_place_edit', 'FrmFieldsController::edit_name' );
+		add_action( 'wp_ajax_frm_update_ajax_option', 'FrmFieldsController::update_ajax_option' );
+		add_action( 'wp_ajax_frm_duplicate_field', 'FrmFieldsController::duplicate' );
+		add_action( 'wp_ajax_frm_delete_field', 'FrmFieldsController::destroy' );
+		add_action( 'wp_ajax_frm_add_field_option', 'FrmFieldsController::add_option' );
+		add_action( 'wp_ajax_frm_field_option_ipe', 'FrmFieldsController::edit_option' );
+		add_action( 'wp_ajax_frm_delete_field_option', 'FrmFieldsController::delete_option' );
+		add_action( 'wp_ajax_frm_import_choices', 'FrmFieldsController::import_choices' );
+		add_action( 'wp_ajax_frm_import_options', 'FrmFieldsController::import_options' );
+		add_action( 'wp_ajax_frm_update_field_order', 'FrmFieldsController::update_order' );
+
+		// Form Actions Controller
+		add_action( 'wp_ajax_frm_add_form_action', 'FrmFormActionsController::add_form_action' );
+		add_action( 'wp_ajax_frm_form_action_fill', 'FrmFormActionsController::fill_action' );
+
+		// Forms Controller
 		add_action( 'wp_ajax_frm_create_from_template', 'FrmFormsController::_create_from_template' );
 		add_action( 'wp_ajax_frm_save_form', 'FrmFormsController::route' );
 		add_action( 'wp_ajax_frm_form_key_in_place_edit', 'FrmFormsController::edit_key' );
 		add_action( 'wp_ajax_frm_form_desc_in_place_edit', 'FrmFormsController::edit_description' );
-        add_action( 'wp_ajax_frm_get_default_html', 'FrmFormsController::get_email_html' );
-        add_action( 'wp_ajax_frm_get_shortcode_opts', 'FrmFormsController::get_shortcode_opts' );
-        add_action( 'wp_ajax_frm_forms_preview', 'FrmFormsController::preview' );
-        add_action( 'wp_ajax_nopriv_frm_forms_preview', 'FrmFormsController::preview' );
-
-        // Styles Controller
-        add_action( 'wp_ajax_frm_settings_reset', 'FrmStylesController::reset_styling' );
-        add_action( 'wp_ajax_frm_change_styling', 'FrmStylesController::change_styling' );
-        add_action( 'wp_ajax_frmpro_load_css', 'FrmStylesController::load_css' );
-        add_action( 'wp_ajax_nopriv_frmpro_load_css', 'FrmStylesController::load_css' );
+		add_action( 'wp_ajax_frm_get_default_html', 'FrmFormsController::get_email_html' );
+		add_action( 'wp_ajax_frm_get_shortcode_opts', 'FrmFormsController::get_shortcode_opts' );
+		add_action( 'wp_ajax_frm_forms_preview', 'FrmFormsController::preview' );
+		add_action( 'wp_ajax_nopriv_frm_forms_preview', 'FrmFormsController::preview' );
+
+		// Styles Controller
+		add_action( 'wp_ajax_frm_settings_reset', 'FrmStylesController::reset_styling' );
+		add_action( 'wp_ajax_frm_change_styling', 'FrmStylesController::change_styling' );
+		add_action( 'wp_ajax_frmpro_load_css', 'FrmStylesController::load_css' );
+		add_action( 'wp_ajax_nopriv_frmpro_load_css', 'FrmStylesController::load_css' );
 		add_action( 'wp_ajax_frmpro_css', 'FrmStylesController::load_saved_css' );
 		add_action( 'wp_ajax_nopriv_frmpro_css', 'FrmStylesController::load_saved_css' );
 
-        // XML Controller
+		// XML Controller
 		add_action( 'wp_ajax_frm_entries_csv', 'FrmXMLController::csv' );
 		add_action( 'wp_ajax_nopriv_frm_entries_csv', 'FrmXMLController::csv' );
-        add_action( 'wp_ajax_frm_export_xml', 'FrmXMLController::export_xml' );
-    }
+		add_action( 'wp_ajax_frm_export_xml', 'FrmXMLController::export_xml' );
+	}
 
 	public static function load_form_hooks() {
-        // Fields Controller
-        add_filter( 'frm_field_type', 'FrmFieldsController::change_type' );
-        add_action( 'frm_field_input_html', 'FrmFieldsController::input_html' );
-        add_filter( 'frm_field_value_saved', 'FrmFieldsController::check_value', 50, 3 );
-        add_filter( 'frm_field_label_seen', 'FrmFieldsController::check_label' );
+		// Fields Controller
+		add_filter( 'frm_field_type', 'FrmFieldsController::change_type' );
+		add_action( 'frm_field_input_html', 'FrmFieldsController::input_html' );
+		add_filter( 'frm_field_value_saved', 'FrmFieldsController::check_value', 50, 3 );
+		add_filter( 'frm_field_label_seen', 'FrmFieldsController::check_label' );
 
 		// Forms Controller
 		add_filter( 'frm_form_classes', 'FrmFormsController::form_classes' );
 
-        // Styles Controller
-        add_filter( 'frm_use_important_width', 'FrmStylesController::important_style', 10, 2 );
-    }
+		// Styles Controller
+		add_filter( 'frm_use_important_width', 'FrmStylesController::important_style', 10, 2 );
+	}
 
 	public static function load_view_hooks() {
-        // Hooks go here when a view is loaded
-    }
+		// Hooks go here when a view is loaded
+	}
 
 	public static function load_multisite_hooks() {
 		add_action( 'init', 'FrmAppController::front_head' );
 		add_action( 'wpmu_upgrade_site', 'FrmAppController::network_upgrade_site' );
 
-        // drop tables when mu site is deleted
-        add_filter( 'wpmu_drop_tables', 'FrmAppController::drop_tables' );
-    }
+		// drop tables when mu site is deleted
+		add_filter( 'wpmu_drop_tables', 'FrmAppController::drop_tables' );
+	}
 }

classes/controllers/FrmSettingsController.php

Indentation +46 added lines, -46 removed lines

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

classes/helpers/FrmEntriesHelper.php

Indentation +290 added lines, -290 removed lines

@@ -5,68 +5,68 @@ 
 
 class FrmEntriesHelper {
 
-    public static function setup_new_vars( $fields, $form = '', $reset = false, $args = array() ) {
-        global $frm_vars;
-        $values = array();
+	public static function setup_new_vars( $fields, $form = '', $reset = false, $args = array() ) {
+		global $frm_vars;
+		$values = array();
 		foreach ( array( 'name' => '', 'description' => '', 'item_key' => '' ) as $var => $default ) {
-            $values[ $var ] = FrmAppHelper::get_post_param( $var, $default );
-        }
-
-        $values['fields'] = array();
-        if ( empty($fields) ) {
-            return apply_filters('frm_setup_new_entry', $values);
-        }
-
-        foreach ( (array) $fields as $field ) {
-            $new_value = self::get_field_value_for_new_entry( $field, $reset );
-
-            $field_array = array(
-                'id' => $field->id,
-                'value' => $new_value,
-                'default_value' => $field->default_value,
-                'name' => $field->name,
-                'description' => $field->description,
-                'type' => apply_filters('frm_field_type', $field->type, $field, $new_value),
-                'options' => $field->options,
-                'required' => $field->required,
-                'field_key' => $field->field_key,
-                'field_order' => $field->field_order,
-                'form_id' => $field->form_id,
+			$values[ $var ] = FrmAppHelper::get_post_param( $var, $default );
+		}
+
+		$values['fields'] = array();
+		if ( empty($fields) ) {
+			return apply_filters('frm_setup_new_entry', $values);
+		}
+
+		foreach ( (array) $fields as $field ) {
+			$new_value = self::get_field_value_for_new_entry( $field, $reset );
+
+			$field_array = array(
+				'id' => $field->id,
+				'value' => $new_value,
+				'default_value' => $field->default_value,
+				'name' => $field->name,
+				'description' => $field->description,
+				'type' => apply_filters('frm_field_type', $field->type, $field, $new_value),
+				'options' => $field->options,
+				'required' => $field->required,
+				'field_key' => $field->field_key,
+				'field_order' => $field->field_order,
+				'form_id' => $field->form_id,
 				'parent_form_id' => isset( $args['parent_form_id'] ) ? $args['parent_form_id'] : $field->form_id,
-            );
+			);
 
-            $opt_defaults = FrmFieldsHelper::get_default_field_opts($field_array['type'], $field, true);
-            $opt_defaults['required_indicator'] = '';
+			$opt_defaults = FrmFieldsHelper::get_default_field_opts($field_array['type'], $field, true);
+			$opt_defaults['required_indicator'] = '';
 			$opt_defaults['original_type'] = $field->type;
 
 			foreach ( $opt_defaults as $opt => $default_opt ) {
-                $field_array[ $opt ] = ( isset( $field->field_options[ $opt ] ) && $field->field_options[ $opt ] != '' ) ? $field->field_options[ $opt ] : $default_opt;
-                unset($opt, $default_opt);
-            }
+				$field_array[ $opt ] = ( isset( $field->field_options[ $opt ] ) && $field->field_options[ $opt ] != '' ) ? $field->field_options[ $opt ] : $default_opt;
+				unset($opt, $default_opt);
+			}
 
-            unset($opt_defaults);
+			unset($opt_defaults);
 
-            if ( $field_array['custom_html'] == '' ) {
-                $field_array['custom_html'] = FrmFieldsHelper::get_default_html($field->type);
-            }
+			if ( $field_array['custom_html'] == '' ) {
+				$field_array['custom_html'] = FrmFieldsHelper::get_default_html($field->type);
+			}
 
-            $field_array = apply_filters('frm_setup_new_fields_vars', $field_array, $field);
-            $field_array = array_merge( $field->field_options, $field_array );
+			$field_array = apply_filters('frm_setup_new_fields_vars', $field_array, $field);
+			$field_array = array_merge( $field->field_options, $field_array );
 
-            $values['fields'][] = $field_array;
+			$values['fields'][] = $field_array;
 
-            if ( ! $form || ! isset($form->id) ) {
-                $form = FrmForm::getOne($field->form_id);
-            }
-        }
+			if ( ! $form || ! isset($form->id) ) {
+				$form = FrmForm::getOne($field->form_id);
+			}
+		}
 
-        $form->options = maybe_unserialize($form->options);
-        if ( is_array($form->options) ) {
-            foreach ( $form->options as $opt => $value ) {
-                $values[ $opt ] = FrmAppHelper::get_post_param( $opt, $value );
-                unset($opt, $value);
-            }
-        }
+		$form->options = maybe_unserialize($form->options);
+		if ( is_array($form->options) ) {
+			foreach ( $form->options as $opt => $value ) {
+				$values[ $opt ] = FrmAppHelper::get_post_param( $opt, $value );
+				unset($opt, $value);
+			}
+		}
 
 		$form_defaults = FrmFormsHelper::get_default_opts();
 
@@ -76,18 +76,18 @@ 
 		$values = array_merge( $form_defaults, $values );
 
 		return apply_filters( 'frm_setup_new_entry', $values );
-    }
+	}
 
 	/**
-	* Set the value for each field
-	* This function is used when the form is first loaded and on all page turns *for a new entry*
-	*
-	* @since 2.0.13
-	*
-	* @param object $field - this is passed by reference since it is an object
-	* @param boolean $reset
-	* @return string|array $new_value
-	*/
+	 * Set the value for each field
+	 * This function is used when the form is first loaded and on all page turns *for a new entry*
+	 *
+	 * @since 2.0.13
+	 *
+	 * @param object $field - this is passed by reference since it is an object
+	 * @param boolean $reset
+	 * @return string|array $new_value
+	 */
 	private static function get_field_value_for_new_entry( $field, $reset ) {
 		//If checkbox, multi-select dropdown, or checkbox data from entries field, the value should be an array
 		$return_array = FrmField::is_field_with_multiple_values( $field );
@@ -118,15 +118,15 @@ 
 
 	public static function setup_edit_vars( $values, $record ) {
 		$values['item_key'] = FrmAppHelper::get_post_param( 'item_key', $record->item_key, 'sanitize_title' );
-        $values['form_id'] = $record->form_id;
-        $values['is_draft'] = $record->is_draft;
-        return apply_filters('frm_setup_edit_entry_vars', $values, $record);
-    }
+		$values['form_id'] = $record->form_id;
+		$values['is_draft'] = $record->is_draft;
+		return apply_filters('frm_setup_edit_entry_vars', $values, $record);
+	}
 
-    public static function get_admin_params( $form = null ) {
+	public static function get_admin_params( $form = null ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmForm::get_admin_params' );
 		return FrmForm::set_current_form( $form );
-    }
+	}
 
 	public static function set_current_form( $form_id ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmForm::set_current_form' );
@@ -138,280 +138,280 @@ 
 		return FrmForm::get_current_form( $form_id );
 	}
 
-    public static function get_current_form_id() {
+	public static function get_current_form_id() {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmForm::get_current_form_id' );
 		return FrmForm::get_current_form_id();
-    }
+	}
 
-    public static function maybe_get_entry( &$entry ) {
+	public static function maybe_get_entry( &$entry ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmEntry::maybe_get_entry' );
 		FrmEntry::maybe_get_entry( $entry );
-    }
+	}
 
 	public static function replace_default_message( $message, $atts ) {
-        if ( strpos($message, '[default-message') === false &&
-            strpos($message, '[default_message') === false &&
-            ! empty( $message ) ) {
-            return $message;
-        }
-
-        if ( empty($message) ) {
-            $message = '[default-message]';
-        }
-
-        preg_match_all("/\[(default-message|default_message)\b(.*?)(?:(\/))?\]/s", $message, $shortcodes, PREG_PATTERN_ORDER);
-
-        foreach ( $shortcodes[0] as $short_key => $tag ) {
-            $add_atts = shortcode_parse_atts( $shortcodes[2][ $short_key ] );
-            if ( $add_atts ) {
-                $this_atts = array_merge($atts, $add_atts);
-            } else {
-                $this_atts = $atts;
-            }
+		if ( strpos($message, '[default-message') === false &&
+			strpos($message, '[default_message') === false &&
+			! empty( $message ) ) {
+			return $message;
+		}
+
+		if ( empty($message) ) {
+			$message = '[default-message]';
+		}
+
+		preg_match_all("/\[(default-message|default_message)\b(.*?)(?:(\/))?\]/s", $message, $shortcodes, PREG_PATTERN_ORDER);
+
+		foreach ( $shortcodes[0] as $short_key => $tag ) {
+			$add_atts = shortcode_parse_atts( $shortcodes[2][ $short_key ] );
+			if ( $add_atts ) {
+				$this_atts = array_merge($atts, $add_atts);
+			} else {
+				$this_atts = $atts;
+			}
 
 			$default = FrmEntryFormat::show_entry( $this_atts );
 
-            // Add the default message
-            $message = str_replace( $shortcodes[0][ $short_key ], $default, $message );
-        }
+			// Add the default message
+			$message = str_replace( $shortcodes[0][ $short_key ], $default, $message );
+		}
 
-        return $message;
-    }
+		return $message;
+	}
 
 	public static function prepare_display_value( $entry, $field, $atts ) {
 		$field_value = isset( $entry->metas[ $field->id ] ) ? $entry->metas[ $field->id ] : false;
-        if ( FrmAppHelper::pro_is_installed() ) {
+		if ( FrmAppHelper::pro_is_installed() ) {
 			FrmProEntriesHelper::get_dynamic_list_values( $field, $entry, $field_value );
-        }
+		}
 
-        if ( $field->form_id == $entry->form_id || empty($atts['embedded_field_id']) ) {
-            return self::display_value($field_value, $field, $atts);
-        }
+		if ( $field->form_id == $entry->form_id || empty($atts['embedded_field_id']) ) {
+			return self::display_value($field_value, $field, $atts);
+		}
 
-        // this is an embeded form
-        $val = '';
+		// this is an embeded form
+		$val = '';
 
-	    if ( strpos($atts['embedded_field_id'], 'form') === 0 ) {
-            //this is a repeating section
+		if ( strpos($atts['embedded_field_id'], 'form') === 0 ) {
+			//this is a repeating section
 			$child_entries = FrmEntry::getAll( array( 'it.parent_item_id' => $entry->id ) );
-        } else {
-            // get all values for this field
-	        $child_values = isset( $entry->metas[ $atts['embedded_field_id'] ] ) ? $entry->metas[ $atts['embedded_field_id'] ] : false;
+		} else {
+			// get all values for this field
+			$child_values = isset( $entry->metas[ $atts['embedded_field_id'] ] ) ? $entry->metas[ $atts['embedded_field_id'] ] : false;
 
-            if ( $child_values ) {
-	            $child_entries = FrmEntry::getAll( array( 'it.id' => (array) $child_values ) );
-	        }
-	    }
+			if ( $child_values ) {
+				$child_entries = FrmEntry::getAll( array( 'it.id' => (array) $child_values ) );
+			}
+		}
 
-	    $field_value = array();
+		$field_value = array();
 
-        if ( ! isset($child_entries) || ! $child_entries || ! FrmAppHelper::pro_is_installed() ) {
-            return $val;
-        }
+		if ( ! isset($child_entries) || ! $child_entries || ! FrmAppHelper::pro_is_installed() ) {
+			return $val;
+		}
 
-        foreach ( $child_entries as $child_entry ) {
-            $atts['item_id'] = $child_entry->id;
-            $atts['post_id'] = $child_entry->post_id;
+		foreach ( $child_entries as $child_entry ) {
+			$atts['item_id'] = $child_entry->id;
+			$atts['post_id'] = $child_entry->post_id;
 
-            // get the value for this field -- check for post values as well
-            $entry_val = FrmProEntryMetaHelper::get_post_or_meta_value($child_entry, $field);
+			// get the value for this field -- check for post values as well
+			$entry_val = FrmProEntryMetaHelper::get_post_or_meta_value($child_entry, $field);
 
-            if ( $entry_val ) {
-                // foreach entry get display_value
-                $field_value[] = self::display_value($entry_val, $field, $atts);
-            }
+			if ( $entry_val ) {
+				// foreach entry get display_value
+				$field_value[] = self::display_value($entry_val, $field, $atts);
+			}
 
-            unset($child_entry);
-        }
+			unset($child_entry);
+		}
 
-        $val = implode(', ', (array) $field_value );
+		$val = implode(', ', (array) $field_value );
 		$val = wp_kses_post( $val );
 
-        return $val;
-    }
+		return $val;
+	}
 
-    /**
-     * Prepare the saved value for display
-     * @return string
-     */
+	/**
+	 * Prepare the saved value for display
+	 * @return string
+	 */
 	public static function display_value( $value, $field, $atts = array() ) {
 
-        $defaults = array(
-            'type' => '', 'html' => false, 'show_filename' => true,
-            'truncate' => false, 'sep' => ', ', 'post_id' => 0,
-            'form_id' => $field->form_id, 'field' => $field, 'keepjs' => 0,
+		$defaults = array(
+			'type' => '', 'html' => false, 'show_filename' => true,
+			'truncate' => false, 'sep' => ', ', 'post_id' => 0,
+			'form_id' => $field->form_id, 'field' => $field, 'keepjs' => 0,
 			'return_array' => false,
-        );
+		);
 
-        $atts = wp_parse_args( $atts, $defaults );
-        $atts = apply_filters('frm_display_value_atts', $atts, $field, $value);
+		$atts = wp_parse_args( $atts, $defaults );
+		$atts = apply_filters('frm_display_value_atts', $atts, $field, $value);
 
-        if ( ! isset($field->field_options['post_field']) ) {
-            $field->field_options['post_field'] = '';
-        }
+		if ( ! isset($field->field_options['post_field']) ) {
+			$field->field_options['post_field'] = '';
+		}
 
-        if ( ! isset($field->field_options['custom_field']) ) {
-            $field->field_options['custom_field'] = '';
-        }
+		if ( ! isset($field->field_options['custom_field']) ) {
+			$field->field_options['custom_field'] = '';
+		}
 
-        if ( FrmAppHelper::pro_is_installed() && $atts['post_id'] && ( $field->field_options['post_field'] || $atts['type'] == 'tag' ) ) {
-            $atts['pre_truncate'] = $atts['truncate'];
-            $atts['truncate'] = true;
-            $atts['exclude_cat'] = isset($field->field_options['exclude_cat']) ? $field->field_options['exclude_cat'] : 0;
+		if ( FrmAppHelper::pro_is_installed() && $atts['post_id'] && ( $field->field_options['post_field'] || $atts['type'] == 'tag' ) ) {
+			$atts['pre_truncate'] = $atts['truncate'];
+			$atts['truncate'] = true;
+			$atts['exclude_cat'] = isset($field->field_options['exclude_cat']) ? $field->field_options['exclude_cat'] : 0;
 
-            $value = FrmProEntryMetaHelper::get_post_value($atts['post_id'], $field->field_options['post_field'], $field->field_options['custom_field'], $atts);
-            $atts['truncate'] = $atts['pre_truncate'];
-        }
+			$value = FrmProEntryMetaHelper::get_post_value($atts['post_id'], $field->field_options['post_field'], $field->field_options['custom_field'], $atts);
+			$atts['truncate'] = $atts['pre_truncate'];
+		}
 
-        if ( $value == '' ) {
-            return $value;
-        }
+		if ( $value == '' ) {
+			return $value;
+		}
 
-        $value = apply_filters('frm_display_value_custom', maybe_unserialize($value), $field, $atts);
+		$value = apply_filters('frm_display_value_custom', maybe_unserialize($value), $field, $atts);
 
-        $new_value = '';
+		$new_value = '';
 
-        if ( is_array($value) && $atts['type'] != 'file' ) {
-            foreach ( $value as $val ) {
-                if ( is_array($val) ) {
+		if ( is_array($value) && $atts['type'] != 'file' ) {
+			foreach ( $value as $val ) {
+				if ( is_array($val) ) {
 					//TODO: add options for display (li or ,)
-                    $new_value .= implode($atts['sep'], $val);
-                    if ( $atts['type'] != 'data' ) {
-                        $new_value .= '<br/>';
-                    }
-                }
-                unset($val);
-            }
-        }
-
-        if ( ! empty($new_value) ) {
-            $value = $new_value;
-        } else if ( is_array($value) && $atts['type'] != 'file' && ! $atts['return_array'] ) {
-            $value = implode($atts['sep'], $value);
-        }
-
-        if ( $atts['truncate'] && $atts['type'] != 'image' ) {
-            $value = FrmAppHelper::truncate($value, 50);
-        }
+					$new_value .= implode($atts['sep'], $val);
+					if ( $atts['type'] != 'data' ) {
+						$new_value .= '<br/>';
+					}
+				}
+				unset($val);
+			}
+		}
+
+		if ( ! empty($new_value) ) {
+			$value = $new_value;
+		} else if ( is_array($value) && $atts['type'] != 'file' && ! $atts['return_array'] ) {
+			$value = implode($atts['sep'], $value);
+		}
+
+		if ( $atts['truncate'] && $atts['type'] != 'image' ) {
+			$value = FrmAppHelper::truncate($value, 50);
+		}
 
 		if ( ! $atts['keepjs'] && ! is_array( $value ) ) {
 			$value = wp_kses_post( $value );
 		}
 
-        return apply_filters('frm_display_value', $value, $field, $atts);
-    }
+		return apply_filters('frm_display_value', $value, $field, $atts);
+	}
 
 	public static function set_posted_value( $field, $value, $args ) {
-        // If validating a field with "other" opt, set back to prev value now
-        if ( isset( $args['other'] ) && $args['other'] ) {
-            $value = $args['temp_value'];
-        }
-        if ( empty($args['parent_field_id']) ) {
-            $_POST['item_meta'][ $field->id ] = $value;
-        } else {
-            $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field->id ] = $value;
-        }
-    }
+		// If validating a field with "other" opt, set back to prev value now
+		if ( isset( $args['other'] ) && $args['other'] ) {
+			$value = $args['temp_value'];
+		}
+		if ( empty($args['parent_field_id']) ) {
+			$_POST['item_meta'][ $field->id ] = $value;
+		} else {
+			$_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field->id ] = $value;
+		}
+	}
 
 	public static function get_posted_value( $field, &$value, $args ) {
 		$field_id = is_object( $field ) ? $field->id : $field;
 
-        if ( empty($args['parent_field_id']) ) {
-            $value = isset( $_POST['item_meta'][ $field_id ] ) ? $_POST['item_meta'][ $field_id ] : '';
-        } else {
-            $value = isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field_id ] ) ? $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field_id ] : '';
-        }
-    }
-
-    /**
-    * Check if field has an "Other" option and if any other values are posted
-    *
-    * @since 2.0
-    *
-    * @param object $field
-    * @param string|array $value
-    * @param array $args
-    */
-    public static function maybe_set_other_validation( $field, &$value, &$args ) {
-        $args['other'] = false;
-        if ( ! $value || empty( $value ) || ! FrmAppHelper::pro_is_installed() ) {
-            return;
-        }
-
-        // Get other value for fields in repeating section
-        self::set_other_repeating_vals( $field, $value, $args );
-
-        // Check if there are any posted "Other" values
+		if ( empty($args['parent_field_id']) ) {
+			$value = isset( $_POST['item_meta'][ $field_id ] ) ? $_POST['item_meta'][ $field_id ] : '';
+		} else {
+			$value = isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field_id ] ) ? $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field_id ] : '';
+		}
+	}
+
+	/**
+	 * Check if field has an "Other" option and if any other values are posted
+	 *
+	 * @since 2.0
+	 *
+	 * @param object $field
+	 * @param string|array $value
+	 * @param array $args
+	 */
+	public static function maybe_set_other_validation( $field, &$value, &$args ) {
+		$args['other'] = false;
+		if ( ! $value || empty( $value ) || ! FrmAppHelper::pro_is_installed() ) {
+			return;
+		}
+
+		// Get other value for fields in repeating section
+		self::set_other_repeating_vals( $field, $value, $args );
+
+		// Check if there are any posted "Other" values
 		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta']['other'][ $field->id ] ) ) {
 
-            // Save original value
-            $args['temp_value'] = $value;
-            $args['other'] = true;
-            $other_vals = stripslashes_deep( $_POST['item_meta']['other'][ $field->id ] );
-
-            // Set the validation value now
-            self::set_other_validation_val( $value, $other_vals, $field, $args );
-        }
-    }
-
-    /**
-    * Sets radio or checkbox value equal to "other" value if it is set - FOR REPEATING SECTIONS
-    *
-    * @since 2.0
-    *
-    * @param object $field
-    * @param string|array $value
-    * @param array $args
-    */
-    public static function set_other_repeating_vals( $field, &$value, &$args ) {
-        if ( ! $args['parent_field_id'] ) {
-            return;
-        }
-
-        // Check if there are any other posted "other" values for this field
+			// Save original value
+			$args['temp_value'] = $value;
+			$args['other'] = true;
+			$other_vals = stripslashes_deep( $_POST['item_meta']['other'][ $field->id ] );
+
+			// Set the validation value now
+			self::set_other_validation_val( $value, $other_vals, $field, $args );
+		}
+	}
+
+	/**
+	 * Sets radio or checkbox value equal to "other" value if it is set - FOR REPEATING SECTIONS
+	 *
+	 * @since 2.0
+	 *
+	 * @param object $field
+	 * @param string|array $value
+	 * @param array $args
+	 */
+	public static function set_other_repeating_vals( $field, &$value, &$args ) {
+		if ( ! $args['parent_field_id'] ) {
+			return;
+		}
+
+		// Check if there are any other posted "other" values for this field
 		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ]['other'][ $field->id ] ) ) {
-            // Save original value
-            $args['temp_value'] = $value;
-            $args['other'] = true;
-
-            $other_vals = $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ]['other'][ $field->id ];
-
-            // Set the validation value now
-            self::set_other_validation_val( $value, $other_vals, $field, $args );
-        }
-    }
-
-    /**
-    * Modify value used for validation
-    * This function essentially removes the "Other" radio or checkbox value from the $value being validated.
-    * It also adds any text from the free text fields to the value
-    *
-    * Needs to accommodate for times when other opt is selected, but no other free text is entered
-    *
-    * @since 2.0
-    *
-    * @param string|array $value
-    * @param string|array $other_vals (usually of posted values)
-    * @param object $field
-    * @param array $args
-    */
-    public static function set_other_validation_val( &$value, $other_vals, $field, &$args ) {
-        // Checkboxes and multi-select dropdowns
-        if ( is_array( $value ) && $field->type == 'checkbox' ) {
-            // Combine "Other" values with checked values. "Other" values will override checked box values.
-            $value = array_merge( $value, $other_vals );
-            $value = array_filter( $value );
-            if ( count( $value ) == 0 ) {
-                $value = '';
-            }
-        } else {
+			// Save original value
+			$args['temp_value'] = $value;
+			$args['other'] = true;
+
+			$other_vals = $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ]['other'][ $field->id ];
+
+			// Set the validation value now
+			self::set_other_validation_val( $value, $other_vals, $field, $args );
+		}
+	}
+
+	/**
+	 * Modify value used for validation
+	 * This function essentially removes the "Other" radio or checkbox value from the $value being validated.
+	 * It also adds any text from the free text fields to the value
+	 *
+	 * Needs to accommodate for times when other opt is selected, but no other free text is entered
+	 *
+	 * @since 2.0
+	 *
+	 * @param string|array $value
+	 * @param string|array $other_vals (usually of posted values)
+	 * @param object $field
+	 * @param array $args
+	 */
+	public static function set_other_validation_val( &$value, $other_vals, $field, &$args ) {
+		// Checkboxes and multi-select dropdowns
+		if ( is_array( $value ) && $field->type == 'checkbox' ) {
+			// Combine "Other" values with checked values. "Other" values will override checked box values.
+			$value = array_merge( $value, $other_vals );
+			$value = array_filter( $value );
+			if ( count( $value ) == 0 ) {
+				$value = '';
+			}
+		} else {
 			// Radio and dropdowns
-            $other_key = array_filter( array_keys($field->options), 'is_string');
-            $other_key = reset( $other_key );
+			$other_key = array_filter( array_keys($field->options), 'is_string');
+			$other_key = reset( $other_key );
 
-            // Multi-select dropdown
-            if ( is_array( $value ) ) {
-                $o_key = array_search( $field->options[ $other_key ], $value );
+			// Multi-select dropdown
+			if ( is_array( $value ) ) {
+				$o_key = array_search( $field->options[ $other_key ], $value );
 
 				if ( $o_key !== false ) {
 					// Modify the original value so other key will be preserved
@@ -426,20 +426,20 @@ 
 					$args['temp_value'] = $value;
 					$value[ $other_key ] = reset( $other_vals );
 				}
-            } else if ( $field->options[ $other_key ] == $value ) {
-                $value = $other_vals;
-            }
-        }
-    }
+			} else if ( $field->options[ $other_key ] == $value ) {
+				$value = $other_vals;
+			}
+		}
+	}
 
 	public static function enqueue_scripts( $params ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmFormsController::enqueue_scripts' );
 		return FrmFormsController::enqueue_scripts( $params );
 	}
 
-    // Add submitted values to a string for spam checking
+	// Add submitted values to a string for spam checking
 	public static function entry_array_to_string( $values ) {
-        $content = '';
+		$content = '';
 		foreach ( $values['item_meta'] as $val ) {
 			if ( $content != '' ) {
 				$content .= "\n\n";
@@ -447,14 +447,14 @@ 
 
 			if ( is_array($val) ) {
 				$val = FrmAppHelper::array_flatten( $val );
-			    $val = implode(',', $val);
+				$val = implode(',', $val);
 			}
 
 			$content .= $val;
 		}
 
 		return $content;
-    }
+	}
 
 	public static function fill_entry_values( $atts, $f, array &$values ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmEntryFormat::fill_entry_values' );

Spacing +74 added lines, -74 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -9,12 +9,12 @@ 
         global $frm_vars;
         $values = array();
 		foreach ( array( 'name' => '', 'description' => '', 'item_key' => '' ) as $var => $default ) {
-            $values[ $var ] = FrmAppHelper::get_post_param( $var, $default );
+            $values[$var] = FrmAppHelper::get_post_param( $var, $default );
         }
 
         $values['fields'] = array();
-        if ( empty($fields) ) {
-            return apply_filters('frm_setup_new_entry', $values);
+        if ( empty( $fields ) ) {
+            return apply_filters( 'frm_setup_new_entry', $values );
         }
 
         foreach ( (array) $fields as $field ) {
@@ -26,7 +26,7 @@ 
                 'default_value' => $field->default_value,
                 'name' => $field->name,
                 'description' => $field->description,
-                'type' => apply_filters('frm_field_type', $field->type, $field, $new_value),
+                'type' => apply_filters( 'frm_field_type', $field->type, $field, $new_value ),
                 'options' => $field->options,
                 'required' => $field->required,
                 'field_key' => $field->field_key,
@@ -35,43 +35,43 @@ 
 				'parent_form_id' => isset( $args['parent_form_id'] ) ? $args['parent_form_id'] : $field->form_id,
             );
 
-            $opt_defaults = FrmFieldsHelper::get_default_field_opts($field_array['type'], $field, true);
+            $opt_defaults = FrmFieldsHelper::get_default_field_opts( $field_array['type'], $field, true );
             $opt_defaults['required_indicator'] = '';
 			$opt_defaults['original_type'] = $field->type;
 
 			foreach ( $opt_defaults as $opt => $default_opt ) {
-                $field_array[ $opt ] = ( isset( $field->field_options[ $opt ] ) && $field->field_options[ $opt ] != '' ) ? $field->field_options[ $opt ] : $default_opt;
-                unset($opt, $default_opt);
+                $field_array[$opt] = ( isset( $field->field_options[$opt] ) && $field->field_options[$opt] != '' ) ? $field->field_options[$opt] : $default_opt;
+                unset( $opt, $default_opt );
             }
 
-            unset($opt_defaults);
+            unset( $opt_defaults );
 
             if ( $field_array['custom_html'] == '' ) {
-                $field_array['custom_html'] = FrmFieldsHelper::get_default_html($field->type);
+                $field_array['custom_html'] = FrmFieldsHelper::get_default_html( $field->type );
             }
 
-            $field_array = apply_filters('frm_setup_new_fields_vars', $field_array, $field);
+            $field_array = apply_filters( 'frm_setup_new_fields_vars', $field_array, $field );
             $field_array = array_merge( $field->field_options, $field_array );
 
             $values['fields'][] = $field_array;
 
-            if ( ! $form || ! isset($form->id) ) {
-                $form = FrmForm::getOne($field->form_id);
+            if ( ! $form || ! isset( $form->id ) ) {
+                $form = FrmForm::getOne( $field->form_id );
             }
         }
 
-        $form->options = maybe_unserialize($form->options);
-        if ( is_array($form->options) ) {
+        $form->options = maybe_unserialize( $form->options );
+        if ( is_array( $form->options ) ) {
             foreach ( $form->options as $opt => $value ) {
-                $values[ $opt ] = FrmAppHelper::get_post_param( $opt, $value );
-                unset($opt, $value);
+                $values[$opt] = FrmAppHelper::get_post_param( $opt, $value );
+                unset( $opt, $value );
             }
         }
 
 		$form_defaults = FrmFormsHelper::get_default_opts();
 
 		$frm_settings = FrmAppHelper::get_settings();
-		$form_defaults['custom_style']  = ( $frm_settings->load_style != 'none' );
+		$form_defaults['custom_style'] = ( $frm_settings->load_style != 'none' );
 
 		$values = array_merge( $form_defaults, $values );
 
@@ -93,15 +93,15 @@ 
 		$return_array = FrmField::is_field_with_multiple_values( $field );
 
 		// Do any shortcodes in default value and allow customization of default value
-		$field->default_value = apply_filters('frm_get_default_value', $field->default_value, $field, true, $return_array);
+		$field->default_value = apply_filters( 'frm_get_default_value', $field->default_value, $field, true, $return_array );
 		// Calls FrmProFieldsHelper::get_default_value
 
 		$new_value = $field->default_value;
 
-		if ( ! $reset && $_POST && isset( $_POST['item_meta'][ $field->id ] ) ) {
+		if ( ! $reset && $_POST && isset( $_POST['item_meta'][$field->id] ) ) {
 			// If value was posted, get it
 
-			$new_value = stripslashes_deep( $_POST['item_meta'][ $field->id ] );
+			$new_value = stripslashes_deep( $_POST['item_meta'][$field->id] );
 
 		} else if ( FrmField::is_option_true( $field, 'clear_on_focus' ) ) {
 			// If clear on focus is selected, the value should be blank (unless it was posted, of course)
@@ -110,7 +110,7 @@ 
 		}
 
 		if ( ! is_array( $new_value ) ) {
-			$new_value = str_replace('"', '&quot;', $new_value);
+			$new_value = str_replace( '"', '&quot;', $new_value );
 		}
 
 		return $new_value;
@@ -120,7 +120,7 @@ 
 		$values['item_key'] = FrmAppHelper::get_post_param( 'item_key', $record->item_key, 'sanitize_title' );
         $values['form_id'] = $record->form_id;
         $values['is_draft'] = $record->is_draft;
-        return apply_filters('frm_setup_edit_entry_vars', $values, $record);
+        return apply_filters( 'frm_setup_edit_entry_vars', $values, $record );
     }
 
     public static function get_admin_params( $form = null ) {
@@ -149,22 +149,22 @@ 
     }
 
 	public static function replace_default_message( $message, $atts ) {
-        if ( strpos($message, '[default-message') === false &&
-            strpos($message, '[default_message') === false &&
+        if ( strpos( $message, '[default-message' ) === false &&
+            strpos( $message, '[default_message' ) === false &&
             ! empty( $message ) ) {
             return $message;
         }
 
-        if ( empty($message) ) {
+        if ( empty( $message ) ) {
             $message = '[default-message]';
         }
 
-        preg_match_all("/\[(default-message|default_message)\b(.*?)(?:(\/))?\]/s", $message, $shortcodes, PREG_PATTERN_ORDER);
+        preg_match_all( "/\[(default-message|default_message)\b(.*?)(?:(\/))?\]/s", $message, $shortcodes, PREG_PATTERN_ORDER );
 
         foreach ( $shortcodes[0] as $short_key => $tag ) {
-            $add_atts = shortcode_parse_atts( $shortcodes[2][ $short_key ] );
+            $add_atts = shortcode_parse_atts( $shortcodes[2][$short_key] );
             if ( $add_atts ) {
-                $this_atts = array_merge($atts, $add_atts);
+                $this_atts = array_merge( $atts, $add_atts );
             } else {
                 $this_atts = $atts;
             }
@@ -172,31 +172,31 @@ 
 			$default = FrmEntryFormat::show_entry( $this_atts );
 
             // Add the default message
-            $message = str_replace( $shortcodes[0][ $short_key ], $default, $message );
+            $message = str_replace( $shortcodes[0][$short_key], $default, $message );
         }
 
         return $message;
     }
 
 	public static function prepare_display_value( $entry, $field, $atts ) {
-		$field_value = isset( $entry->metas[ $field->id ] ) ? $entry->metas[ $field->id ] : false;
+		$field_value = isset( $entry->metas[$field->id] ) ? $entry->metas[$field->id] : false;
         if ( FrmAppHelper::pro_is_installed() ) {
 			FrmProEntriesHelper::get_dynamic_list_values( $field, $entry, $field_value );
         }
 
-        if ( $field->form_id == $entry->form_id || empty($atts['embedded_field_id']) ) {
-            return self::display_value($field_value, $field, $atts);
+        if ( $field->form_id == $entry->form_id || empty( $atts['embedded_field_id'] ) ) {
+            return self::display_value( $field_value, $field, $atts );
         }
 
         // this is an embeded form
         $val = '';
 
-	    if ( strpos($atts['embedded_field_id'], 'form') === 0 ) {
+	    if ( strpos( $atts['embedded_field_id'], 'form' ) === 0 ) {
             //this is a repeating section
 			$child_entries = FrmEntry::getAll( array( 'it.parent_item_id' => $entry->id ) );
         } else {
             // get all values for this field
-	        $child_values = isset( $entry->metas[ $atts['embedded_field_id'] ] ) ? $entry->metas[ $atts['embedded_field_id'] ] : false;
+	        $child_values = isset( $entry->metas[$atts['embedded_field_id']] ) ? $entry->metas[$atts['embedded_field_id']] : false;
 
             if ( $child_values ) {
 	            $child_entries = FrmEntry::getAll( array( 'it.id' => (array) $child_values ) );
@@ -205,7 +205,7 @@ 
 
 	    $field_value = array();
 
-        if ( ! isset($child_entries) || ! $child_entries || ! FrmAppHelper::pro_is_installed() ) {
+        if ( ! isset( $child_entries ) || ! $child_entries || ! FrmAppHelper::pro_is_installed() ) {
             return $val;
         }
 
@@ -214,17 +214,17 @@ 
             $atts['post_id'] = $child_entry->post_id;
 
             // get the value for this field -- check for post values as well
-            $entry_val = FrmProEntryMetaHelper::get_post_or_meta_value($child_entry, $field);
+            $entry_val = FrmProEntryMetaHelper::get_post_or_meta_value( $child_entry, $field );
 
             if ( $entry_val ) {
                 // foreach entry get display_value
-                $field_value[] = self::display_value($entry_val, $field, $atts);
+                $field_value[] = self::display_value( $entry_val, $field, $atts );
             }
 
-            unset($child_entry);
+            unset( $child_entry );
         }
 
-        $val = implode(', ', (array) $field_value );
+        $val = implode( ', ', (array) $field_value );
 		$val = wp_kses_post( $val );
 
         return $val;
@@ -244,22 +244,22 @@ 
         );
 
         $atts = wp_parse_args( $atts, $defaults );
-        $atts = apply_filters('frm_display_value_atts', $atts, $field, $value);
+        $atts = apply_filters( 'frm_display_value_atts', $atts, $field, $value );
 
-        if ( ! isset($field->field_options['post_field']) ) {
+        if ( ! isset( $field->field_options['post_field'] ) ) {
             $field->field_options['post_field'] = '';
         }
 
-        if ( ! isset($field->field_options['custom_field']) ) {
+        if ( ! isset( $field->field_options['custom_field'] ) ) {
             $field->field_options['custom_field'] = '';
         }
 
         if ( FrmAppHelper::pro_is_installed() && $atts['post_id'] && ( $field->field_options['post_field'] || $atts['type'] == 'tag' ) ) {
             $atts['pre_truncate'] = $atts['truncate'];
             $atts['truncate'] = true;
-            $atts['exclude_cat'] = isset($field->field_options['exclude_cat']) ? $field->field_options['exclude_cat'] : 0;
+            $atts['exclude_cat'] = isset( $field->field_options['exclude_cat'] ) ? $field->field_options['exclude_cat'] : 0;
 
-            $value = FrmProEntryMetaHelper::get_post_value($atts['post_id'], $field->field_options['post_field'], $field->field_options['custom_field'], $atts);
+            $value = FrmProEntryMetaHelper::get_post_value( $atts['post_id'], $field->field_options['post_field'], $field->field_options['custom_field'], $atts );
             $atts['truncate'] = $atts['pre_truncate'];
         }
 
@@ -267,38 +267,38 @@ 
             return $value;
         }
 
-        $value = apply_filters('frm_display_value_custom', maybe_unserialize($value), $field, $atts);
+        $value = apply_filters( 'frm_display_value_custom', maybe_unserialize( $value ), $field, $atts );
 
         $new_value = '';
 
-        if ( is_array($value) && $atts['type'] != 'file' ) {
+        if ( is_array( $value ) && $atts['type'] != 'file' ) {
             foreach ( $value as $val ) {
-                if ( is_array($val) ) {
+                if ( is_array( $val ) ) {
 					//TODO: add options for display (li or ,)
-                    $new_value .= implode($atts['sep'], $val);
+                    $new_value .= implode( $atts['sep'], $val );
                     if ( $atts['type'] != 'data' ) {
                         $new_value .= '<br/>';
                     }
                 }
-                unset($val);
+                unset( $val );
             }
         }
 
-        if ( ! empty($new_value) ) {
+        if ( ! empty( $new_value ) ) {
             $value = $new_value;
-        } else if ( is_array($value) && $atts['type'] != 'file' && ! $atts['return_array'] ) {
-            $value = implode($atts['sep'], $value);
+        } else if ( is_array( $value ) && $atts['type'] != 'file' && ! $atts['return_array'] ) {
+            $value = implode( $atts['sep'], $value );
         }
 
         if ( $atts['truncate'] && $atts['type'] != 'image' ) {
-            $value = FrmAppHelper::truncate($value, 50);
+            $value = FrmAppHelper::truncate( $value, 50 );
         }
 
 		if ( ! $atts['keepjs'] && ! is_array( $value ) ) {
 			$value = wp_kses_post( $value );
 		}
 
-        return apply_filters('frm_display_value', $value, $field, $atts);
+        return apply_filters( 'frm_display_value', $value, $field, $atts );
     }
 
 	public static function set_posted_value( $field, $value, $args ) {
@@ -306,20 +306,20 @@ 
         if ( isset( $args['other'] ) && $args['other'] ) {
             $value = $args['temp_value'];
         }
-        if ( empty($args['parent_field_id']) ) {
-            $_POST['item_meta'][ $field->id ] = $value;
+        if ( empty( $args['parent_field_id'] ) ) {
+            $_POST['item_meta'][$field->id] = $value;
         } else {
-            $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field->id ] = $value;
+            $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']][$field->id] = $value;
         }
     }
 
 	public static function get_posted_value( $field, &$value, $args ) {
 		$field_id = is_object( $field ) ? $field->id : $field;
 
-        if ( empty($args['parent_field_id']) ) {
-            $value = isset( $_POST['item_meta'][ $field_id ] ) ? $_POST['item_meta'][ $field_id ] : '';
+        if ( empty( $args['parent_field_id'] ) ) {
+            $value = isset( $_POST['item_meta'][$field_id] ) ? $_POST['item_meta'][$field_id] : '';
         } else {
-            $value = isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field_id ] ) ? $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field_id ] : '';
+            $value = isset( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']][$field_id] ) ? $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']][$field_id] : '';
         }
     }
 
@@ -342,12 +342,12 @@ 
         self::set_other_repeating_vals( $field, $value, $args );
 
         // Check if there are any posted "Other" values
-		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta']['other'][ $field->id ] ) ) {
+		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta']['other'][$field->id] ) ) {
 
             // Save original value
             $args['temp_value'] = $value;
             $args['other'] = true;
-            $other_vals = stripslashes_deep( $_POST['item_meta']['other'][ $field->id ] );
+            $other_vals = stripslashes_deep( $_POST['item_meta']['other'][$field->id] );
 
             // Set the validation value now
             self::set_other_validation_val( $value, $other_vals, $field, $args );
@@ -369,12 +369,12 @@ 
         }
 
         // Check if there are any other posted "other" values for this field
-		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ]['other'][ $field->id ] ) ) {
+		if ( FrmField::is_option_true( $field, 'other' ) && isset( $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']]['other'][$field->id] ) ) {
             // Save original value
             $args['temp_value'] = $value;
             $args['other'] = true;
 
-            $other_vals = $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ]['other'][ $field->id ];
+            $other_vals = $_POST['item_meta'][$args['parent_field_id']][$args['key_pointer']]['other'][$field->id];
 
             // Set the validation value now
             self::set_other_validation_val( $value, $other_vals, $field, $args );
@@ -406,27 +406,27 @@ 
             }
         } else {
 			// Radio and dropdowns
-            $other_key = array_filter( array_keys($field->options), 'is_string');
+            $other_key = array_filter( array_keys( $field->options ), 'is_string' );
             $other_key = reset( $other_key );
 
             // Multi-select dropdown
             if ( is_array( $value ) ) {
-                $o_key = array_search( $field->options[ $other_key ], $value );
+                $o_key = array_search( $field->options[$other_key], $value );
 
 				if ( $o_key !== false ) {
 					// Modify the original value so other key will be preserved
-					$value[ $other_key ] = $value[ $o_key ];
+					$value[$other_key] = $value[$o_key];
 
 					// By default, the array keys will be numeric for multi-select dropdowns
 					// If going backwards and forwards between pages, the array key will match the other key
 					if ( $o_key != $other_key ) {
-						unset( $value[ $o_key ] );
+						unset( $value[$o_key] );
 					}
 
 					$args['temp_value'] = $value;
-					$value[ $other_key ] = reset( $other_vals );
+					$value[$other_key] = reset( $other_vals );
 				}
-            } else if ( $field->options[ $other_key ] == $value ) {
+            } else if ( $field->options[$other_key] == $value ) {
                 $value = $other_vals;
             }
         }
@@ -445,9 +445,9 @@ 
 				$content .= "\n\n";
 			}
 
-			if ( is_array($val) ) {
+			if ( is_array( $val ) ) {
 				$val = FrmAppHelper::array_flatten( $val );
-			    $val = implode(',', $val);
+			    $val = implode( ',', $val );
 			}
 
 			$content .= $val;
@@ -492,6 +492,6 @@ 
 	}
 
 	public static function entries_dropdown() {
-		_deprecated_function( __FUNCTION__, '1.07.09');
+		_deprecated_function( __FUNCTION__, '1.07.09' );
 	}
 }

classes/helpers/FrmEntriesListHelper.php

Indentation +73 added lines, -73 removed lines

@@ -6,46 +6,46 @@ 
 	protected $field;
 
 	public function prepare_items() {
-        global $wpdb, $per_page;
+		global $wpdb, $per_page;
 
 		$per_page = $this->get_items_per_page( 'formidable_page_formidable_entries_per_page' );
 
-        $form_id = $this->params['form'];
-        if ( ! $form_id ) {
-            $this->items = array();
-    		$this->set_pagination_args( array(
-    			'total_items' => 0,
+		$form_id = $this->params['form'];
+		if ( ! $form_id ) {
+			$this->items = array();
+			$this->set_pagination_args( array(
+				'total_items' => 0,
 				'per_page' => $per_page,
-    		) );
-            return;
-        }
+			) );
+			return;
+		}
 
 		$default_orderby = 'id';
 		$default_order = 'DESC';
 
-	    $s_query = array( 'it.form_id' => $form_id );
+		$s_query = array( 'it.form_id' => $form_id );
 
 		$s = isset( $_REQUEST['s'] ) ? stripslashes($_REQUEST['s']) : '';
 
-	    if ( $s != '' && FrmAppHelper::pro_is_installed() ) {
-	        $fid = isset( $_REQUEST['fid'] ) ? sanitize_title( $_REQUEST['fid'] ) : '';
-	        $s_query = FrmProEntriesHelper::get_search_str( $s_query, $s, $form_id, $fid);
-	    }
+		if ( $s != '' && FrmAppHelper::pro_is_installed() ) {
+			$fid = isset( $_REQUEST['fid'] ) ? sanitize_title( $_REQUEST['fid'] ) : '';
+			$s_query = FrmProEntriesHelper::get_search_str( $s_query, $s, $form_id, $fid);
+		}
 
-        $orderby = isset( $_REQUEST['orderby'] ) ? sanitize_title( $_REQUEST['orderby'] ) : $default_orderby;
-        if ( strpos($orderby, 'meta') !== false ) {
-            $order_field_type = FrmField::get_type( str_replace( 'meta_', '', $orderby ) );
+		$orderby = isset( $_REQUEST['orderby'] ) ? sanitize_title( $_REQUEST['orderby'] ) : $default_orderby;
+		if ( strpos($orderby, 'meta') !== false ) {
+			$order_field_type = FrmField::get_type( str_replace( 'meta_', '', $orderby ) );
 			$orderby .= in_array( $order_field_type, array( 'number', 'scale' ) ) ? ' +0 ' : '';
-        }
+		}
 
 		$order = isset( $_REQUEST['order'] ) ? sanitize_title( $_REQUEST['order'] ) : $default_order;
 		$order = ' ORDER BY ' . $orderby . ' ' . $order;
 
-        $page = $this->get_pagenum();
+		$page = $this->get_pagenum();
 		$start = (int) isset( $_REQUEST['start'] ) ? absint( $_REQUEST['start'] ) : ( ( $page - 1 ) * $per_page );
 
-        $this->items = FrmEntry::getAll($s_query, $order, ' LIMIT '. $start .','. $per_page, true, false);
-        $total_items = FrmEntry::getRecordCount($s_query);
+		$this->items = FrmEntry::getAll($s_query, $order, ' LIMIT '. $start .','. $per_page, true, false);
+		$total_items = FrmEntry::getRecordCount($s_query);
 
 		$this->set_pagination_args( array(
 			'total_items' => $total_items,
@@ -54,19 +54,19 @@ 
 	}
 
 	public function no_items() {
-        $s = isset( $_REQUEST['s'] ) ? $_REQUEST['s'] : '';
-	    if ( ! empty($s) ) {
-            _e( 'No Entries Found', 'formidable' );
-            return;
-        }
-
-        $form_id = $form = $this->params['form'];
-        if ( $form_id ) {
-            $form = FrmForm::getOne($form_id);
-        }
-        $colspan = $this->get_column_count();
-
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-entries/no_entries.php');
+		$s = isset( $_REQUEST['s'] ) ? $_REQUEST['s'] : '';
+		if ( ! empty($s) ) {
+			_e( 'No Entries Found', 'formidable' );
+			return;
+		}
+
+		$form_id = $form = $this->params['form'];
+		if ( $form_id ) {
+			$form = FrmForm::getOne($form_id);
+		}
+		$colspan = $this->get_column_count();
+
+		include(FrmAppHelper::plugin_path() .'/classes/views/frm-entries/no_entries.php');
 	}
 
 	public function search_box( $text, $input_id ) {
@@ -74,12 +74,12 @@ 
 	}
 
 	/**
-	* Gets the name of the primary column in the Entries screen
-	*
-	* @since 2.0.14
-	*
-	* @return string $primary_column
-	*/
+	 * Gets the name of the primary column in the Entries screen
+	 *
+	 * @since 2.0.14
+	 *
+	 * @return string $primary_column
+	 */
 	protected function get_primary_column_name() {
 		$columns = get_column_headers( $this->screen );
 		$hidden = get_hidden_columns( $this->screen );
@@ -103,7 +103,7 @@ 
 
 		$this->get_actions( $actions, $item, $view_link );
 
-        $action_links = $this->row_actions( $actions );
+		$action_links = $this->row_actions( $actions );
 
 		// Set up the checkbox ( because the user is editable, otherwise its empty )
 		$checkbox = "<input type='checkbox' name='item-action[]' id='cb-item-action-{$item->id}' value='{$item->id}' />";
@@ -111,7 +111,7 @@ 
 		$r = "<tr id='item-action-{$item->id}'$style>";
 
 		list( $columns, $hidden, , $primary ) = $this->get_column_info();
-        $action_col = false;
+		$action_col = false;
 
 		foreach ( $columns as $column_name => $column_display_name ) {
 			$class = $column_name .' column-'. $column_name;
@@ -123,14 +123,14 @@ 
 			if ( in_array( $column_name, $hidden ) ) {
 				$class .= ' frm_hidden';
 			} else if ( ! $action_col && ! in_array( $column_name, array( 'cb', 'id', 'form_id', 'post_id' ) ) ) {
-			    $action_col = $column_name;
-            }
+				$action_col = $column_name;
+			}
 
 			$attributes = 'class="' . esc_attr( $class ) . '"';
 			unset($class);
 			$attributes .= ' data-colname="' . $column_display_name  . '"';
 
-            $col_name = preg_replace('/^('. $this->params['form'] .'_)/', '', $column_name);
+			$col_name = preg_replace('/^('. $this->params['form'] .'_)/', '', $column_name);
 			$this->column_name = $col_name;
 
 			switch ( $col_name ) {
@@ -140,30 +140,30 @@ 
 				case 'ip':
 				case 'id':
 				case 'item_key':
-				    $val = $item->{$col_name};
-				    break;
+					$val = $item->{$col_name};
+					break;
 				case 'name':
 				case 'description':
-				    $val = FrmAppHelper::truncate(strip_tags($item->{$col_name}), 100);
-				    break;
+					$val = FrmAppHelper::truncate(strip_tags($item->{$col_name}), 100);
+					break;
 				case 'created_at':
 				case 'updated_at':
-				    $date = FrmAppHelper::get_formatted_time($item->{$col_name});
+					$date = FrmAppHelper::get_formatted_time($item->{$col_name});
 					$val = '<abbr title="' . esc_attr( FrmAppHelper::get_formatted_time( $item->{$col_name}, '', 'g:i:s A' ) ) . '">' . $date . '</abbr>';
 					break;
 				case 'is_draft':
-				    $val = empty($item->is_draft) ? __( 'No') : __( 'Yes');
-			        break;
+					$val = empty($item->is_draft) ? __( 'No') : __( 'Yes');
+					break;
 				case 'form_id':
-				    $val = FrmFormsHelper::edit_form_link($item->form_id);
-    				break;
+					$val = FrmFormsHelper::edit_form_link($item->form_id);
+					break;
 				case 'post_id':
-				    $val = FrmAppHelper::post_edit_link($item->post_id);
-				    break;
+					$val = FrmAppHelper::post_edit_link($item->post_id);
+					break;
 				case 'user_id':
-				    $user = get_userdata($item->user_id);
-				    $val = $user->user_login;
-				    break;
+					$user = get_userdata($item->user_id);
+					$val = $user->user_login;
+					break;
 				default:
 					$val = apply_filters( 'frm_entries_' . $col_name . '_column', false, compact( 'item' ) );
 					if ( $val === false ) {
@@ -173,15 +173,15 @@ 
 			}
 
 			if ( isset( $val ) ) {
-			    $r .= "<td $attributes>";
+				$r .= "<td $attributes>";
 				if ( $column_name == $action_col ) {
 					$edit_link = '?page=formidable-entries&frm_action=edit&id='. $item->id;
 					$r .= '<a href="' . esc_url( isset( $actions['edit'] ) ? $edit_link : $view_link ) . '" class="row-title" >' . $val . '</a> ';
-			        $r .= $action_links;
+					$r .= $action_links;
 				} else {
-			        $r .= $val;
-			    }
-			    $r .= '</td>';
+					$r .= $val;
+				}
+				$r .= '</td>';
 			}
 			unset($val);
 		}
@@ -190,19 +190,19 @@ 
 		return $r;
 	}
 
-    /**
-     * @param string $view_link
-     */
-    private function get_actions( &$actions, $item, $view_link ) {
+	/**
+	 * @param string $view_link
+	 */
+	private function get_actions( &$actions, $item, $view_link ) {
 		$actions['view'] = '<a href="' . esc_url( $view_link ) . '">'. __( 'View', 'formidable' ) .'</a>';
 
-        if ( current_user_can('frm_delete_entries') ) {
-            $delete_link = '?page=formidable-entries&frm_action=destroy&id='. $item->id .'&form='. $this->params['form'];
+		if ( current_user_can('frm_delete_entries') ) {
+			$delete_link = '?page=formidable-entries&frm_action=destroy&id='. $item->id .'&form='. $this->params['form'];
 			$actions['delete'] = '<a href="' . esc_url( wp_nonce_url( $delete_link ) ) . '" class="submitdelete" onclick="return confirm(\'' . esc_attr( __( 'Are you sure you want to delete that?', 'formidable' ) ) . '\')">' . __( 'Delete' ) . '</a>';
-	    }
+		}
 
-        $actions = apply_filters('frm_row_actions', $actions, $item);
-    }
+		$actions = apply_filters('frm_row_actions', $actions, $item);
+	}
 
 	private function get_column_value( $item, &$val ) {
 		$col_name = $this->column_name;

Spacing +26 added lines, -26 removed lines

@@ -25,15 +25,15 @@ 
 
 	    $s_query = array( 'it.form_id' => $form_id );
 
-		$s = isset( $_REQUEST['s'] ) ? stripslashes($_REQUEST['s']) : '';
+		$s = isset( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : '';
 
 	    if ( $s != '' && FrmAppHelper::pro_is_installed() ) {
 	        $fid = isset( $_REQUEST['fid'] ) ? sanitize_title( $_REQUEST['fid'] ) : '';
-	        $s_query = FrmProEntriesHelper::get_search_str( $s_query, $s, $form_id, $fid);
+	        $s_query = FrmProEntriesHelper::get_search_str( $s_query, $s, $form_id, $fid );
 	    }
 
         $orderby = isset( $_REQUEST['orderby'] ) ? sanitize_title( $_REQUEST['orderby'] ) : $default_orderby;
-        if ( strpos($orderby, 'meta') !== false ) {
+        if ( strpos( $orderby, 'meta' ) !== false ) {
             $order_field_type = FrmField::get_type( str_replace( 'meta_', '', $orderby ) );
 			$orderby .= in_array( $order_field_type, array( 'number', 'scale' ) ) ? ' +0 ' : '';
         }
@@ -44,8 +44,8 @@ 
         $page = $this->get_pagenum();
 		$start = (int) isset( $_REQUEST['start'] ) ? absint( $_REQUEST['start'] ) : ( ( $page - 1 ) * $per_page );
 
-        $this->items = FrmEntry::getAll($s_query, $order, ' LIMIT '. $start .','. $per_page, true, false);
-        $total_items = FrmEntry::getRecordCount($s_query);
+        $this->items = FrmEntry::getAll( $s_query, $order, ' LIMIT ' . $start . ',' . $per_page, true, false );
+        $total_items = FrmEntry::getRecordCount( $s_query );
 
 		$this->set_pagination_args( array(
 			'total_items' => $total_items,
@@ -55,18 +55,18 @@ 
 
 	public function no_items() {
         $s = isset( $_REQUEST['s'] ) ? $_REQUEST['s'] : '';
-	    if ( ! empty($s) ) {
+	    if ( ! empty( $s ) ) {
             _e( 'No Entries Found', 'formidable' );
             return;
         }
 
         $form_id = $form = $this->params['form'];
         if ( $form_id ) {
-            $form = FrmForm::getOne($form_id);
+            $form = FrmForm::getOne( $form_id );
         }
         $colspan = $this->get_column_count();
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-entries/no_entries.php');
+        include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/no_entries.php' );
 	}
 
 	public function search_box( $text, $input_id ) {
@@ -99,7 +99,7 @@ 
 	public function single_row( $item, $style = '' ) {
 		// Set up the hover actions for this user
 		$actions = array();
-		$view_link = '?page=formidable-entries&frm_action=show&id='. $item->id;
+		$view_link = '?page=formidable-entries&frm_action=show&id=' . $item->id;
 
 		$this->get_actions( $actions, $item, $view_link );
 
@@ -110,11 +110,11 @@ 
 
 		$r = "<tr id='item-action-{$item->id}'$style>";
 
-		list( $columns, $hidden, , $primary ) = $this->get_column_info();
+		list( $columns, $hidden,, $primary ) = $this->get_column_info();
         $action_col = false;
 
 		foreach ( $columns as $column_name => $column_display_name ) {
-			$class = $column_name .' column-'. $column_name;
+			$class = $column_name . ' column-' . $column_name;
 
 			if ( $column_name === $primary ) {
 				$class .= ' column-primary';
@@ -127,10 +127,10 @@ 
             }
 
 			$attributes = 'class="' . esc_attr( $class ) . '"';
-			unset($class);
-			$attributes .= ' data-colname="' . $column_display_name  . '"';
+			unset( $class );
+			$attributes .= ' data-colname="' . $column_display_name . '"';
 
-            $col_name = preg_replace('/^('. $this->params['form'] .'_)/', '', $column_name);
+            $col_name = preg_replace( '/^(' . $this->params['form'] . '_)/', '', $column_name );
 			$this->column_name = $col_name;
 
 			switch ( $col_name ) {
@@ -144,24 +144,24 @@ 
 				    break;
 				case 'name':
 				case 'description':
-				    $val = FrmAppHelper::truncate(strip_tags($item->{$col_name}), 100);
+				    $val = FrmAppHelper::truncate( strip_tags( $item->{$col_name}), 100 );
 				    break;
 				case 'created_at':
 				case 'updated_at':
-				    $date = FrmAppHelper::get_formatted_time($item->{$col_name});
+				    $date = FrmAppHelper::get_formatted_time( $item->{$col_name});
 					$val = '<abbr title="' . esc_attr( FrmAppHelper::get_formatted_time( $item->{$col_name}, '', 'g:i:s A' ) ) . '">' . $date . '</abbr>';
 					break;
 				case 'is_draft':
-				    $val = empty($item->is_draft) ? __( 'No') : __( 'Yes');
+				    $val = empty( $item->is_draft ) ? __( 'No' ) : __( 'Yes' );
 			        break;
 				case 'form_id':
-				    $val = FrmFormsHelper::edit_form_link($item->form_id);
+				    $val = FrmFormsHelper::edit_form_link( $item->form_id );
     				break;
 				case 'post_id':
-				    $val = FrmAppHelper::post_edit_link($item->post_id);
+				    $val = FrmAppHelper::post_edit_link( $item->post_id );
 				    break;
 				case 'user_id':
-				    $user = get_userdata($item->user_id);
+				    $user = get_userdata( $item->user_id );
 				    $val = $user->user_login;
 				    break;
 				default:
@@ -175,7 +175,7 @@ 
 			if ( isset( $val ) ) {
 			    $r .= "<td $attributes>";
 				if ( $column_name == $action_col ) {
-					$edit_link = '?page=formidable-entries&frm_action=edit&id='. $item->id;
+					$edit_link = '?page=formidable-entries&frm_action=edit&id=' . $item->id;
 					$r .= '<a href="' . esc_url( isset( $actions['edit'] ) ? $edit_link : $view_link ) . '" class="row-title" >' . $val . '</a> ';
 			        $r .= $action_links;
 				} else {
@@ -183,7 +183,7 @@ 
 			    }
 			    $r .= '</td>';
 			}
-			unset($val);
+			unset( $val );
 		}
 		$r .= '</tr>';
 
@@ -194,14 +194,14 @@ 
      * @param string $view_link
      */
     private function get_actions( &$actions, $item, $view_link ) {
-		$actions['view'] = '<a href="' . esc_url( $view_link ) . '">'. __( 'View', 'formidable' ) .'</a>';
+		$actions['view'] = '<a href="' . esc_url( $view_link ) . '">' . __( 'View', 'formidable' ) . '</a>';
 
-        if ( current_user_can('frm_delete_entries') ) {
-            $delete_link = '?page=formidable-entries&frm_action=destroy&id='. $item->id .'&form='. $this->params['form'];
+        if ( current_user_can( 'frm_delete_entries' ) ) {
+            $delete_link = '?page=formidable-entries&frm_action=destroy&id=' . $item->id . '&form=' . $this->params['form'];
 			$actions['delete'] = '<a href="' . esc_url( wp_nonce_url( $delete_link ) ) . '" class="submitdelete" onclick="return confirm(\'' . esc_attr( __( 'Are you sure you want to delete that?', 'formidable' ) ) . '\')">' . __( 'Delete' ) . '</a>';
 	    }
 
-        $actions = apply_filters('frm_row_actions', $actions, $item);
+        $actions = apply_filters( 'frm_row_actions', $actions, $item );
     }
 
 	private function get_column_value( $item, &$val ) {

classes/helpers/FrmStylesHelper.php

Indentation +111 added lines, -111 removed lines

@@ -1,67 +1,67 @@ 
 <?php
 class FrmStylesHelper {
 
-    public static function jquery_themes() {
-        $themes = array(
-            'ui-lightness'  => 'UI Lightness',
-            'ui-darkness'   => 'UI Darkness',
-            'smoothness'    => 'Smoothness',
-            'start'         => 'Start',
-            'redmond'       => 'Redmond',
-            'sunny'         => 'Sunny',
-            'overcast'      => 'Overcast',
-            'le-frog'       => 'Le Frog',
-            'flick'         => 'Flick',
+	public static function jquery_themes() {
+		$themes = array(
+			'ui-lightness'  => 'UI Lightness',
+			'ui-darkness'   => 'UI Darkness',
+			'smoothness'    => 'Smoothness',
+			'start'         => 'Start',
+			'redmond'       => 'Redmond',
+			'sunny'         => 'Sunny',
+			'overcast'      => 'Overcast',
+			'le-frog'       => 'Le Frog',
+			'flick'         => 'Flick',
 			'pepper-grinder' => 'Pepper Grinder',
-            'eggplant'      => 'Eggplant',
-            'dark-hive'     => 'Dark Hive',
-            'cupertino'     => 'Cupertino',
-            'south-street'  => 'South Street',
-            'blitzer'       => 'Blitzer',
-            'humanity'      => 'Humanity',
-            'hot-sneaks'    => 'Hot Sneaks',
-            'excite-bike'   => 'Excite Bike',
-            'vader'         => 'Vader',
-            'dot-luv'       => 'Dot Luv',
-            'mint-choc'     => 'Mint Choc',
-            'black-tie'     => 'Black Tie',
-            'trontastic'    => 'Trontastic',
-            'swanky-purse'  => 'Swanky Purse',
-        );
-
-        $themes = apply_filters('frm_jquery_themes', $themes);
-        return $themes;
-    }
+			'eggplant'      => 'Eggplant',
+			'dark-hive'     => 'Dark Hive',
+			'cupertino'     => 'Cupertino',
+			'south-street'  => 'South Street',
+			'blitzer'       => 'Blitzer',
+			'humanity'      => 'Humanity',
+			'hot-sneaks'    => 'Hot Sneaks',
+			'excite-bike'   => 'Excite Bike',
+			'vader'         => 'Vader',
+			'dot-luv'       => 'Dot Luv',
+			'mint-choc'     => 'Mint Choc',
+			'black-tie'     => 'Black Tie',
+			'trontastic'    => 'Trontastic',
+			'swanky-purse'  => 'Swanky Purse',
+		);
+
+		$themes = apply_filters('frm_jquery_themes', $themes);
+		return $themes;
+	}
 
 	public static function jquery_css_url( $theme_css ) {
-        if ( $theme_css == -1 ) {
-            return;
-        }
-
-        if ( ! $theme_css || $theme_css == '' || $theme_css == 'ui-lightness' ) {
-            $css_file = FrmAppHelper::plugin_url() . '/css/ui-lightness/jquery-ui.css';
-        } else if ( preg_match('/^http.?:\/\/.*\..*$/', $theme_css) ) {
-            $css_file = $theme_css;
-        } else {
-            $uploads = self::get_upload_base();
-            $file_path = '/formidable/css/'. $theme_css . '/jquery-ui.css';
-            if ( file_exists($uploads['basedir'] . $file_path) ) {
-                $css_file = $uploads['baseurl'] . $file_path;
-            } else {
-                $css_file = FrmAppHelper::jquery_ui_base_url() .'/themes/'. $theme_css . '/jquery-ui.min.css';
-            }
-        }
-
-        return $css_file;
-    }
-
-    public static function enqueue_jquery_css() {
+		if ( $theme_css == -1 ) {
+			return;
+		}
+
+		if ( ! $theme_css || $theme_css == '' || $theme_css == 'ui-lightness' ) {
+			$css_file = FrmAppHelper::plugin_url() . '/css/ui-lightness/jquery-ui.css';
+		} else if ( preg_match('/^http.?:\/\/.*\..*$/', $theme_css) ) {
+			$css_file = $theme_css;
+		} else {
+			$uploads = self::get_upload_base();
+			$file_path = '/formidable/css/'. $theme_css . '/jquery-ui.css';
+			if ( file_exists($uploads['basedir'] . $file_path) ) {
+				$css_file = $uploads['baseurl'] . $file_path;
+			} else {
+				$css_file = FrmAppHelper::jquery_ui_base_url() .'/themes/'. $theme_css . '/jquery-ui.min.css';
+			}
+		}
+
+		return $css_file;
+	}
+
+	public static function enqueue_jquery_css() {
 		$form = self::get_form_for_page();
 		$theme_css = FrmStylesController::get_style_val( 'theme_css', $form );
-        if ( $theme_css != -1 ) {
-            wp_enqueue_style('jquery-theme', self::jquery_css_url($theme_css), array(), FrmAppHelper::plugin_version());
-        }
-    }
+		if ( $theme_css != -1 ) {
+			wp_enqueue_style('jquery-theme', self::jquery_css_url($theme_css), array(), FrmAppHelper::plugin_version());
+		}
+	}
 
 	public static function get_form_for_page() {
 		global $frm_vars;
@@ -77,14 +77,14 @@ 
 		return $form_id;
 	}
 
-    public static function get_upload_base() {
-        $uploads = wp_upload_dir();
-        if ( is_ssl() && ! preg_match('/^https:\/\/.*\..*$/', $uploads['baseurl']) ) {
-            $uploads['baseurl'] = str_replace('http://', 'https://', $uploads['baseurl']);
-        }
+	public static function get_upload_base() {
+		$uploads = wp_upload_dir();
+		if ( is_ssl() && ! preg_match('/^https:\/\/.*\..*$/', $uploads['baseurl']) ) {
+			$uploads['baseurl'] = str_replace('http://', 'https://', $uploads['baseurl']);
+		}
 
-        return $uploads;
-    }
+		return $uploads;
+	}
 
 	public static function style_menu( $active = '' ) {
 ?>
@@ -94,22 +94,22 @@ 
 			<a href="<?php echo esc_url( admin_url('admin.php?page=formidable-styles&frm_action=custom_css' ) ) ?>" class="nav-tab <?php echo ( 'custom_css' == $active ) ? 'nav-tab-active' : '' ?>"><?php _e( 'Custom CSS', 'formidable' ) ?></a>
         </h2>
 <?php
-    }
+	}
 
-    public static function minus_icons() {
-        return array(
+	public static function minus_icons() {
+		return array(
 			0 => array( '-' => '62e', '+' => '62f' ),
 			1 => array( '-' => '600', '+' => '602' ),
 			2 => array( '-' => '604', '+' => '603' ),
 			3 => array( '-' => '633', '+' => '632' ),
 			4 => array( '-' => '613', '+' => '60f' ),
-        );
-    }
+		);
+	}
 
-    public static function arrow_icons() {
-        $minus_icons = self::minus_icons();
+	public static function arrow_icons() {
+		$minus_icons = self::minus_icons();
 
-        return array(
+		return array(
 			6 => array( '-' => '62d', '+' => '62a' ),
 			0 => array( '-' => '60d', '+' => '609' ),
 			1 => array( '-' => '60e', '+' => '60c' ),
@@ -117,44 +117,44 @@ 
 			3 => array( '-' => '62b', '+' => '628' ),
 			4 => array( '-' => '62c', '+' => '629' ),
 			5 => array( '-' => '635', '+' => '634' ),
-            'p0' => $minus_icons[0],
-            'p1' => $minus_icons[1],
-            'p2' => $minus_icons[2],
-            'p3' => $minus_icons[3],
-            'p4' => $minus_icons[4],
-        );
-    }
-
-    /**
-     * @since 2.0
-     * @return The class for this icon
-     */
+			'p0' => $minus_icons[0],
+			'p1' => $minus_icons[1],
+			'p2' => $minus_icons[2],
+			'p3' => $minus_icons[3],
+			'p4' => $minus_icons[4],
+		);
+	}
+
+	/**
+	 * @since 2.0
+	 * @return The class for this icon
+	 */
 	public static function icon_key_to_class( $key, $icon = '+', $type = 'arrow' ) {
-        if ( 'arrow' == $type && is_numeric($key) ) {
-            //frm_arrowup6_icon
+		if ( 'arrow' == $type && is_numeric($key) ) {
+			//frm_arrowup6_icon
 			$arrow = array( '-' => 'down', '+' => 'up' );
 			$class = 'frm_arrow' . $arrow[ $icon ];
-        } else {
-            //frm_minus1_icon
-            $key = str_replace('p', '', $key);
+		} else {
+			//frm_minus1_icon
+			$key = str_replace('p', '', $key);
 			$plus = array( '-' => 'minus', '+' => 'plus' );
 			$class = 'frm_' . $plus[ $icon ];
-        }
+		}
 
-        if ( $key ) {
-            $class .= $key;
-        }
-        $class .= '_icon';
+		if ( $key ) {
+			$class .= $key;
+		}
+		$class .= '_icon';
 
-        return $class;
-    }
+		return $class;
+	}
 
 	public static function bs_icon_select( $style, $frm_style, $type = 'arrow' ) {
 		$function_name = $type . '_icons';
 		$icons = self::$function_name();
 		unset( $function_name );
 
-        $name = ( 'arrow' == $type ) ? 'collapse_icon' : 'repeat_icon';
+		$name = ( 'arrow' == $type ) ? 'collapse_icon' : 'repeat_icon';
 ?>
     	<select name="<?php echo esc_attr( $frm_style->get_field_name($name) ) ?>" id="frm_<?php echo esc_attr( $name ) ?>" class="frm_icon_font frm_multiselect hide-if-js">
             <?php foreach ( $icons as $key => $icon ) { ?>
@@ -187,22 +187,22 @@ 
             </ul>
         </div>
 <?php
-    }
+	}
 
 	public static function hex2rgb( $hex ) {
-        $hex = str_replace('#', '', $hex);
-
-        if ( strlen($hex) == 3 ) {
-            $r = hexdec( substr($hex,0,1).substr($hex,0,1) );
-            $g = hexdec( substr($hex,1,1).substr($hex,1,1) );
-            $b = hexdec( substr($hex,2,1).substr($hex,2,1) );
-        } else {
-            $r = hexdec( substr($hex,0,2) );
-            $g = hexdec( substr($hex,2,2) );
-            $b = hexdec( substr($hex,4,2) );
-        }
+		$hex = str_replace('#', '', $hex);
+
+		if ( strlen($hex) == 3 ) {
+			$r = hexdec( substr($hex,0,1).substr($hex,0,1) );
+			$g = hexdec( substr($hex,1,1).substr($hex,1,1) );
+			$b = hexdec( substr($hex,2,1).substr($hex,2,1) );
+		} else {
+			$r = hexdec( substr($hex,0,2) );
+			$g = hexdec( substr($hex,2,2) );
+			$b = hexdec( substr($hex,4,2) );
+		}
 		$rgb = array( $r, $g, $b );
-        return implode(',', $rgb); // returns the rgb values separated by commas
-        //return $rgb; // returns an array with the rgb values
-    }
+		return implode(',', $rgb); // returns the rgb values separated by commas
+		//return $rgb; // returns an array with the rgb values
+	}
 }

Spacing +27 added lines, -27 removed lines

@@ -29,7 +29,7 @@ 
             'swanky-purse'  => 'Swanky Purse',
         );
 
-        $themes = apply_filters('frm_jquery_themes', $themes);
+        $themes = apply_filters( 'frm_jquery_themes', $themes );
         return $themes;
     }
 
@@ -40,15 +40,15 @@ 
 
         if ( ! $theme_css || $theme_css == '' || $theme_css == 'ui-lightness' ) {
             $css_file = FrmAppHelper::plugin_url() . '/css/ui-lightness/jquery-ui.css';
-        } else if ( preg_match('/^http.?:\/\/.*\..*$/', $theme_css) ) {
+        } else if ( preg_match( '/^http.?:\/\/.*\..*$/', $theme_css ) ) {
             $css_file = $theme_css;
         } else {
             $uploads = self::get_upload_base();
-            $file_path = '/formidable/css/'. $theme_css . '/jquery-ui.css';
-            if ( file_exists($uploads['basedir'] . $file_path) ) {
+            $file_path = '/formidable/css/' . $theme_css . '/jquery-ui.css';
+            if ( file_exists( $uploads['basedir'] . $file_path ) ) {
                 $css_file = $uploads['baseurl'] . $file_path;
             } else {
-                $css_file = FrmAppHelper::jquery_ui_base_url() .'/themes/'. $theme_css . '/jquery-ui.min.css';
+                $css_file = FrmAppHelper::jquery_ui_base_url() . '/themes/' . $theme_css . '/jquery-ui.min.css';
             }
         }
 
@@ -59,7 +59,7 @@ 
 		$form = self::get_form_for_page();
 		$theme_css = FrmStylesController::get_style_val( 'theme_css', $form );
         if ( $theme_css != -1 ) {
-            wp_enqueue_style('jquery-theme', self::jquery_css_url($theme_css), array(), FrmAppHelper::plugin_version());
+            wp_enqueue_style( 'jquery-theme', self::jquery_css_url( $theme_css ), array(), FrmAppHelper::plugin_version() );
         }
     }
 
@@ -79,8 +79,8 @@ 
 
     public static function get_upload_base() {
         $uploads = wp_upload_dir();
-        if ( is_ssl() && ! preg_match('/^https:\/\/.*\..*$/', $uploads['baseurl']) ) {
-            $uploads['baseurl'] = str_replace('http://', 'https://', $uploads['baseurl']);
+        if ( is_ssl() && ! preg_match( '/^https:\/\/.*\..*$/', $uploads['baseurl'] ) ) {
+            $uploads['baseurl'] = str_replace( 'http://', 'https://', $uploads['baseurl'] );
         }
 
         return $uploads;
@@ -91,7 +91,7 @@ 
         <h2 class="nav-tab-wrapper">
 			<a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable-styles' ) ) ?>" class="nav-tab <?php echo ( '' == $active ) ? 'nav-tab-active' : '' ?>"><?php _e( 'Edit Styles', 'formidable' ) ?></a>
 			<a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable-styles&frm_action=manage' ) ) ?>" class="nav-tab <?php echo ( 'manage' == $active ) ? 'nav-tab-active' : '' ?>"><?php _e( 'Manage Form Styles', 'formidable' ) ?></a>
-			<a href="<?php echo esc_url( admin_url('admin.php?page=formidable-styles&frm_action=custom_css' ) ) ?>" class="nav-tab <?php echo ( 'custom_css' == $active ) ? 'nav-tab-active' : '' ?>"><?php _e( 'Custom CSS', 'formidable' ) ?></a>
+			<a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable-styles&frm_action=custom_css' ) ) ?>" class="nav-tab <?php echo ( 'custom_css' == $active ) ? 'nav-tab-active' : '' ?>"><?php _e( 'Custom CSS', 'formidable' ) ?></a>
         </h2>
 <?php
     }
@@ -130,15 +130,15 @@ 
      * @return The class for this icon
      */
 	public static function icon_key_to_class( $key, $icon = '+', $type = 'arrow' ) {
-        if ( 'arrow' == $type && is_numeric($key) ) {
+        if ( 'arrow' == $type && is_numeric( $key ) ) {
             //frm_arrowup6_icon
 			$arrow = array( '-' => 'down', '+' => 'up' );
-			$class = 'frm_arrow' . $arrow[ $icon ];
+			$class = 'frm_arrow' . $arrow[$icon];
         } else {
             //frm_minus1_icon
-            $key = str_replace('p', '', $key);
+            $key = str_replace( 'p', '', $key );
 			$plus = array( '-' => 'minus', '+' => 'plus' );
-			$class = 'frm_' . $plus[ $icon ];
+			$class = 'frm_' . $plus[$icon];
         }
 
         if ( $key ) {
@@ -156,18 +156,18 @@ 
 
         $name = ( 'arrow' == $type ) ? 'collapse_icon' : 'repeat_icon';
 ?>
-    	<select name="<?php echo esc_attr( $frm_style->get_field_name($name) ) ?>" id="frm_<?php echo esc_attr( $name ) ?>" class="frm_icon_font frm_multiselect hide-if-js">
+    	<select name="<?php echo esc_attr( $frm_style->get_field_name( $name ) ) ?>" id="frm_<?php echo esc_attr( $name ) ?>" class="frm_icon_font frm_multiselect hide-if-js">
             <?php foreach ( $icons as $key => $icon ) { ?>
-			<option value="<?php echo esc_attr( $key ) ?>" <?php selected( $style->post_content[ $name ], $key ) ?>>
-                <?php echo '&#xe'. $icon['+'] .'; &#xe'. $icon['-'] .';'; ?>
+			<option value="<?php echo esc_attr( $key ) ?>" <?php selected( $style->post_content[$name], $key ) ?>>
+                <?php echo '&#xe' . $icon['+'] . '; &#xe' . $icon['-'] . ';'; ?>
             </option>
             <?php } ?>
     	</select>
 
         <div class="btn-group hide-if-no-js" id="frm_<?php echo esc_attr( $name ) ?>_select">
             <button class="multiselect dropdown-toggle btn btn-default" data-toggle="dropdown" type="button">
-				<i class="frm_icon_font <?php echo esc_attr( self::icon_key_to_class( $style->post_content[ $name ], '+', $type ) ) ?>"></i>
-				<i class="frm_icon_font <?php echo esc_attr( self::icon_key_to_class( $style->post_content[ $name ], '-', $type ) ) ?>"></i>
+				<i class="frm_icon_font <?php echo esc_attr( self::icon_key_to_class( $style->post_content[$name], '+', $type ) ) ?>"></i>
+				<i class="frm_icon_font <?php echo esc_attr( self::icon_key_to_class( $style->post_content[$name], '-', $type ) ) ?>"></i>
                 <b class="caret"></b>
             </button>
             <ul class="multiselect-container frm-dropdown-menu">
@@ -190,19 +190,19 @@ 
     }
 
 	public static function hex2rgb( $hex ) {
-        $hex = str_replace('#', '', $hex);
+        $hex = str_replace( '#', '', $hex );
 
-        if ( strlen($hex) == 3 ) {
-            $r = hexdec( substr($hex,0,1).substr($hex,0,1) );
-            $g = hexdec( substr($hex,1,1).substr($hex,1,1) );
-            $b = hexdec( substr($hex,2,1).substr($hex,2,1) );
+        if ( strlen( $hex ) == 3 ) {
+            $r = hexdec( substr( $hex, 0, 1 ) . substr( $hex, 0, 1 ) );
+            $g = hexdec( substr( $hex, 1, 1 ) . substr( $hex, 1, 1 ) );
+            $b = hexdec( substr( $hex, 2, 1 ) . substr( $hex, 2, 1 ) );
         } else {
-            $r = hexdec( substr($hex,0,2) );
-            $g = hexdec( substr($hex,2,2) );
-            $b = hexdec( substr($hex,4,2) );
+            $r = hexdec( substr( $hex, 0, 2 ) );
+            $g = hexdec( substr( $hex, 2, 2 ) );
+            $b = hexdec( substr( $hex, 4, 2 ) );
         }
 		$rgb = array( $r, $g, $b );
-        return implode(',', $rgb); // returns the rgb values separated by commas
+        return implode( ',', $rgb ); // returns the rgb values separated by commas
         //return $rgb; // returns an array with the rgb values
     }
 }

classes/helpers/FrmXMLHelper.php

Spacing +175 added lines, -175 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -11,7 +11,7 @@ 
 				echo "\n" . $padding;
 				$tag = ( is_numeric( $ok ) ? 'key:' : '' ) . $ok;
 				echo '<' . $tag . '>';
-				self::get_xml_values( $ov, $padding .'    ' );
+				self::get_xml_values( $ov, $padding . '    ' );
 				if ( is_array( $ov ) ) {
 					echo "\n" . $padding;
 				}
@@ -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,21 +67,21 @@ 
         // 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;
     }
 
 	public static function import_xml_terms( $terms, $imported ) {
         foreach ( $terms as $t ) {
-			if ( term_exists((string) $t->term_slug, (string) $t->term_taxonomy) ) {
+			if ( term_exists( (string) $t->term_slug, (string) $t->term_taxonomy ) ) {
 			    continue;
 			}
 
@@ -92,11 +92,11 @@ 
                 'description'   => (string) $t->term_description,
 				'parent'        => empty( $parent ) ? 0 : $parent,
                 'slug'          => (string) $t->term_slug,
-            ));
+            ) );
 
 			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 );
@@ -139,11 +139,11 @@ 
                 'default_template' => (int) $item->default_template,
                 'editable'      => (int) $item->editable,
                 'status'        => (string) $item->status,
-                'parent_form_id' => isset($item->parent_form_id) ? (int) $item->parent_form_id : 0,
-                'created_at'    => date('Y-m-d H:i:s', strtotime((string) $item->created_at)),
+                'parent_form_id' => isset( $item->parent_form_id ) ? (int) $item->parent_form_id : 0,
+                'created_at'    => date( 'Y-m-d H:i:s', strtotime( (string) $item->created_at ) ),
             );
 
-            $form['options'] = FrmAppHelper::maybe_json_decode($form['options']);
+            $form['options'] = FrmAppHelper::maybe_json_decode( $form['options'] );
 
             // if template, allow to edit if form keys match, otherwise, creation date must also match
 			$edit_query = array( 'form_key' => $form['form_key'], 'is_template' => $form['is_template'] );
@@ -151,35 +151,35 @@ 
                 $edit_query['created_at'] = $form['created_at'];
             }
 
-            $edit_query = apply_filters('frm_match_xml_form', $edit_query, $form);
+            $edit_query = apply_filters( 'frm_match_xml_form', $edit_query, $form );
 
-            $this_form = FrmForm::getAll($edit_query, '', 1);
-            unset($edit_query);
+            $this_form = FrmForm::getAll( $edit_query, '', 1 );
+            unset( $edit_query );
 
             if ( ! empty( $this_form ) ) {
                 $old_id = $form_id = $this_form->id;
-                FrmForm::update($form_id, $form );
-                $imported['updated']['forms']++;
+                FrmForm::update( $form_id, $form );
+                $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';
 
 				$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;
-                unset($old_fields);
+                unset( $old_fields );
             } else {
                 $old_id = false;
                 //form does not exist, so create it
 				$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 );
                 }
             }
@@ -189,23 +189,23 @@ 
     		// Delete any fields attached to this form that were not included in the template
     		if ( isset( $form_fields ) && ! empty( $form_fields ) ) {
 				foreach ( $form_fields as $field ) {
-                    if ( is_object($field) ) {
-                        FrmField::destroy($field->id);
+                    if ( is_object( $field ) ) {
+                        FrmField::destroy( $field->id );
                     }
-                    unset($field);
+                    unset( $field );
                 }
-                unset($form_fields);
+                unset( $form_fields );
             }
 
 		    // 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 );
 
-		    unset($form, $item);
+		    unset( $form, $item );
 		}
 
 		self::maybe_update_child_form_parent_id( $imported['forms'], $child_forms );
@@ -224,7 +224,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;
@@ -246,7 +246,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;
 		}
 	}
 
@@ -261,9 +261,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 ) );
 			}
@@ -284,51 +284,51 @@ 
 		        '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 ),
 		    );
 
-		    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 ) {
-		            $f['default_value'] = '['. reset($f['default_value']) .']';
+		    ) ) ) {
+		        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'] );
 		        }
 		    }
 
-		    $f = apply_filters('frm_duplicated_field', $f);
+		    $f = apply_filters( 'frm_duplicated_field', $f );
 
 			self::maybe_update_form_select( $f, $imported );
 
-		    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 {
 					$new_id = FrmField::create( $f );
 					if ( $new_id == false ) {
@@ -336,7 +336,7 @@ 
 					}
 
 		            // if no matching field id or key in this form, create the field
-		            $imported['imported']['fields']++;
+		            $imported['imported']['fields'] ++;
 		        }
 			} else {
 				$new_id = FrmField::create( $f );
@@ -344,10 +344,10 @@ 
 					continue;
 				}
 
-	            $imported['imported']['fields']++;
+	            $imported['imported']['fields'] ++;
 		    }
 
-			unset($field, $new_id);
+			unset( $field, $new_id );
 		}
 	}
 
@@ -366,8 +366,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];
 				}
 			}
 		}
@@ -395,8 +395,8 @@ 
 				'post_id'       => (int) $item->post_id,
 				'post_parent'   => (int) $item->post_parent,
 				'menu_order'    => (int) $item->menu_order,
-				'post_content'  => FrmFieldsHelper::switch_field_ids((string) $item->content),
-				'post_excerpt'  => FrmFieldsHelper::switch_field_ids((string) $item->excerpt),
+				'post_content'  => FrmFieldsHelper::switch_field_ids( (string) $item->content ),
+				'post_excerpt'  => FrmFieldsHelper::switch_field_ids( (string) $item->excerpt ),
 				'is_sticky'     => (string) $item->is_sticky,
 				'comment_status' => (string) $item->comment_status,
 				'post_date'     => (string) $item->post_date,
@@ -407,9 +407,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 ) {
@@ -417,7 +417,7 @@ 
 				if ( $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'] );
@@ -430,26 +430,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 );
@@ -458,23 +458,23 @@ 
     }
 
     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']];
 		}
 
 		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 ) {
@@ -486,27 +486,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';
     		            }
@@ -517,22 +517,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'];
     }
 
     /**
@@ -548,23 +548,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 );
 		}
     }
 
@@ -581,29 +581,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 );
         }
     }
 
@@ -620,13 +620,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;
         }
@@ -638,20 +638,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>';
             }
         }
@@ -680,18 +680,18 @@ 
             '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 );
     }
 
 	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;
         }
 
@@ -723,7 +723,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;
         }
 
@@ -734,7 +734,7 @@ 
             'menu_order'    => $form_id,
             'post_status'   => 'publish',
             'post_content'  => array(),
-            'post_name'     => $form_id .'_wppost_1',
+            'post_name'     => $form_id . '_wppost_1',
         );
 
         $post_settings = array(
@@ -744,10 +744,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' );
@@ -761,7 +761,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'],
@@ -773,7 +773,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'] ++;
         }
     }
 
@@ -805,11 +805,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 );
@@ -832,14 +832,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';
 
@@ -852,7 +852,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'],
@@ -861,11 +861,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 );
         }
     }
 
@@ -878,7 +878,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 );
@@ -906,12 +906,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 );
@@ -921,7 +921,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' );
         }
     }
@@ -942,18 +942,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 ) {
@@ -963,18 +963,18 @@ 
                 'email_to'      => $atts['email_to'],
                 'event'         => $atts['event'],
             ),
-            'post_name'         => $atts['form_id'] .'_email_'. $atts['email_key'],
+            '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 ) {
-			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 );
         }
@@ -984,7 +984,7 @@ 
 
         // 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'] ) .'>';
+            $new_notification['post_content']['from'] = ( empty( $atts['reply_to_name'] ) ? '[sitename]' : $atts['reply_to_name'] ) . ' <' . ( empty( $atts['reply_to'] ) ? '[admin_email]' : $atts['reply_to'] ) . '>';
         }
     }
 
@@ -998,50 +998,50 @@ 
 		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) ) {
-                $email_field = '['. $email_field .']';
+            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_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 ),
+                '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;
 			}
 
 			if ( ! empty( $reply_to ) || ! empty( $reply_to_name ) ) {
-                $new_notification2['post_content']['from'] = ( empty($reply_to_name) ? '[sitename]' : $reply_to_name ) .' <'. ( empty($reply_to) ? '[admin_email]' : $reply_to ) .'>';
+                $new_notification2['post_content']['from'] = ( empty( $reply_to_name ) ? '[sitename]' : $reply_to_name ) . ' <' . ( empty( $reply_to ) ? '[admin_email]' : $reply_to ) . '>';
 			}
 
             $notifications[] = $new_notification2;

Indentation +595 added lines, -595 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,99 +127,99 @@ 
 		self::put_child_forms_first( $forms );
 
 		foreach ( $forms as $item ) {
-            $form = array(
-                'id'            => (int) $item->id,
-                'form_key'      => (string) $item->form_key,
-                'name'          => (string) $item->name,
-                'description'   => (string) $item->description,
-                'options'       => (string) $item->options,
-                'logged_in'     => (int) $item->logged_in,
-                'is_template'   => (int) $item->is_template,
-                'default_template' => (int) $item->default_template,
-                'editable'      => (int) $item->editable,
-                'status'        => (string) $item->status,
-                'parent_form_id' => isset($item->parent_form_id) ? (int) $item->parent_form_id : 0,
-                'created_at'    => date('Y-m-d H:i:s', strtotime((string) $item->created_at)),
-            );
-
-            $form['options'] = FrmAppHelper::maybe_json_decode($form['options']);
+			$form = array(
+				'id'            => (int) $item->id,
+				'form_key'      => (string) $item->form_key,
+				'name'          => (string) $item->name,
+				'description'   => (string) $item->description,
+				'options'       => (string) $item->options,
+				'logged_in'     => (int) $item->logged_in,
+				'is_template'   => (int) $item->is_template,
+				'default_template' => (int) $item->default_template,
+				'editable'      => (int) $item->editable,
+				'status'        => (string) $item->status,
+				'parent_form_id' => isset($item->parent_form_id) ? (int) $item->parent_form_id : 0,
+				'created_at'    => date('Y-m-d H:i:s', strtotime((string) $item->created_at)),
+			);
+
+			$form['options'] = FrmAppHelper::maybe_json_decode($form['options']);
 
 			self::update_custom_style_setting_on_import( $form );
 
-            // if template, allow to edit if form keys match, otherwise, creation date must also match
+			// if template, allow to edit if form keys match, otherwise, creation date must also match
 			$edit_query = array( 'form_key' => $form['form_key'], 'is_template' => $form['is_template'] );
-            if ( ! $form['is_template'] ) {
-                $edit_query['created_at'] = $form['created_at'];
-            }
+			if ( ! $form['is_template'] ) {
+				$edit_query['created_at'] = $form['created_at'];
+			}
 
-            $edit_query = apply_filters('frm_match_xml_form', $edit_query, $form);
+			$edit_query = apply_filters('frm_match_xml_form', $edit_query, $form);
 
-            $this_form = FrmForm::getAll($edit_query, '', 1);
-            unset($edit_query);
+			$this_form = FrmForm::getAll($edit_query, '', 1);
+			unset($edit_query);
 
-            if ( ! empty( $this_form ) ) {
-                $old_id = $form_id = $this_form->id;
-                FrmForm::update($form_id, $form );
-                $imported['updated']['forms']++;
-                // Keep track of whether this specific form was updated or not
+			if ( ! empty( $this_form ) ) {
+				$old_id = $form_id = $this_form->id;
+				FrmForm::update($form_id, $form );
+				$imported['updated']['forms']++;
+				// Keep track of whether this specific form was updated or not
 				$imported['form_status'][ $form_id ] = 'updated';
 
 				$form_fields = FrmField::get_all_for_form( $form_id, '', 'exclude', 'exclude' );
-                $old_fields = array();
-                foreach ( $form_fields as $f ) {
+				$old_fields = array();
+				foreach ( $form_fields as $f ) {
 					$old_fields[ $f->id ] = $f;
 					$old_fields[ $f->field_key ] = $f->id;
-                    unset($f);
-                }
-                $form_fields = $old_fields;
-                unset($old_fields);
-            } else {
-                $old_id = false;
-                //form does not exist, so create it
+					unset($f);
+				}
+				$form_fields = $old_fields;
+				unset($old_fields);
+			} else {
+				$old_id = false;
+				//form does not exist, so create it
 				$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::import_xml_fields( $item->field, $form_id, $this_form, $form_fields, $imported );
 
-    		// Delete any fields attached to this form that were not included in the template
-    		if ( isset( $form_fields ) && ! empty( $form_fields ) ) {
+			// Delete any fields attached to this form that were not included in the template
+			if ( isset( $form_fields ) && ! empty( $form_fields ) ) {
 				foreach ( $form_fields as $field ) {
-                    if ( is_object($field) ) {
-                        FrmField::destroy($field->id);
-                    }
-                    unset($field);
-                }
-                unset($form_fields);
-            }
-
-		    // Update field ids/keys to new ones
+					if ( is_object($field) ) {
+						FrmField::destroy($field->id);
+					}
+					unset($field);
+				}
+				unset($form_fields);
+			}
+
+			// 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 );
 
-		    unset($form, $item);
+			unset($form, $item);
 		}
 
 		self::maybe_update_child_form_parent_id( $imported['forms'], $child_forms );
 
 		return $imported;
-    }
+	}
 
 	/**
-	* 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();
@@ -238,13 +238,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;
@@ -252,13 +252,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 ) {
 
@@ -272,61 +272,61 @@ 
 	}
 
 	/**
-	* 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 ) {
 		foreach ( $xml_fields as $field ) {
-		    $f = array(
-		        'id'            => (int) $field->id,
-		        'field_key'     => (string) $field->field_key,
-		        'name'          => (string) $field->name,
-		        'description'   => (string) $field->description,
-		        'type'          => (string) $field->type,
-		        '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),
+			$f = array(
+				'id'            => (int) $field->id,
+				'field_key'     => (string) $field->field_key,
+				'name'          => (string) $field->name,
+				'description'   => (string) $field->description,
+				'type'          => (string) $field->type,
+				'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),
 				'field_options' => FrmAppHelper::maybe_json_decode( (string) $field->field_options ),
-		    );
-
-		    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']);
-		        }
-		    }
-
-		    $f = apply_filters('frm_duplicated_field', $f);
+			);
+
+			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']);
+				}
+			}
+
+			$f = apply_filters('frm_duplicated_field', $f);
 
 			self::maybe_update_form_select( $f, $imported );
 
-		    if ( ! empty($this_form) ) {
-		        // check for field to edit by field id
+			if ( ! empty($this_form) ) {
+				// check for field to edit by field id
 				if ( isset( $form_fields[ $f['id'] ] ) ) {
-		            FrmField::update( $f['id'], $f );
-		            $imported['updated']['fields']++;
+					FrmField::update( $f['id'], $f );
+					$imported['updated']['fields']++;
 
 					unset( $form_fields[ $f['id'] ] );
 
-		            //unset old field key
+					//unset old field key
 					if ( isset( $form_fields[ $f['field_key'] ] ) ) {
 						unset( $form_fields[ $f['field_key'] ] );
 					}
 				} else if ( isset( $form_fields[ $f['field_key'] ] ) ) {
-		            // check for field to edit by field key
-		            unset($f['id']);
+					// check for field to edit by field key
+					unset($f['id']);
 
 					FrmField::update( $form_fields[ $f['field_key'] ], $f );
-		            $imported['updated']['fields']++;
+					$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
@@ -336,29 +336,29 @@ 
 						continue;
 					}
 
-		            // if no matching field id or key in this form, create the field
-		            $imported['imported']['fields']++;
-		        }
+					// if no matching field id or key in this form, create the field
+					$imported['imported']['fields']++;
+				}
 			} else {
 				$new_id = FrmField::create( $f );
 				if ( $new_id == false ) {
 					continue;
 				}
 
-	            $imported['imported']['fields']++;
-		    }
+				$imported['imported']['fields']++;
+			}
 
 			unset($field, $new_id);
 		}
 	}
 
 	/**
-	* 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;
@@ -375,12 +375,12 @@ 
 	}
 
 	/**
-	* Updates the custom style setting on import
-	*
-	* @since 2.0.19
-	* @param array $form
-	*
-	*/
+	 * Updates the custom style setting on import
+	 *
+	 * @since 2.0.19
+	 * @param array $form
+	 *
+	 */
 	private static function update_custom_style_setting_on_import( &$form ) {
 		if ( is_numeric( $form['options']['custom_style'] ) ) {
 			// Set to default
@@ -407,16 +407,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,
@@ -435,52 +435,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 ) {
 					$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;
 		}
@@ -488,157 +488,157 @@ 
 		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'] ];
 		}
 
 		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 ) {
 		if ( ( isset( $imported['imported']['styles'] ) && ! empty( $imported['imported']['styles'] ) ) || ( isset( $imported['updated']['styles'] ) && ! empty( $imported['updated']['styles'] ) ) ) {
@@ -649,72 +649,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
@@ -745,16 +745,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;
+		}
 
 		// $str = ent2ncr(esc_html($str));
 		$str = '<![CDATA[' . str_replace( ']]>', ']]]]><![CDATA[>', $str ) . ']]>';
@@ -762,58 +762,58 @@ 
 		return $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(),
-            'post_name'     => $form_id .'_wppost_1',
-        );
-
-        $post_settings = array(
-            'post_type', 'post_category', 'post_content',
-            'post_excerpt', 'post_title', 'post_name', 'post_date',
+			'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_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' );
 
@@ -821,22 +821,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
@@ -849,211 +849,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'],
-            ),
-            '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 ) {
+				}
+				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 ) {
 			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'] ) .'>';
-        }
-    }
+			$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'] ) ) {
@@ -1066,48 +1066,48 @@ 
 		}
 	}
 
-    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,
-                ),
-                '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'] : '';
+	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,
+				),
+				'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'] : '';
 
 			if ( ! empty( $reply_to ) ) {
 				$new_notification2['post_content']['reply_to'] = $reply_to;
 			}
 
 			if ( ! empty( $reply_to ) || ! empty( $reply_to_name ) ) {
-                $new_notification2['post_content']['from'] = ( empty($reply_to_name) ? '[sitename]' : $reply_to_name ) .' <'. ( empty($reply_to) ? '[admin_email]' : $reply_to ) .'>';
+				$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 );
+		}
+	}
 }