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 +1181 added lines, -1181 removed lines

@@ -12,123 +12,123 @@ 
 	 */
 	public static $plug_version = '2.0.19b3';
 
-    /**
-     * @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');
-    }
-
-    /**
-     * 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;
-    }
-
-    /**
-     * Show a message in place of pro features
-     *
-     * @since 2.0
-     */
+	/**
+	 * @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');
+	}
+
+	/**
+	 * 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;
+	}
+
+	/**
+	 * 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
@@ -138,101 +138,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;
+	}
 
 	/**
 	 *
@@ -253,7 +253,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
@@ -287,12 +287,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 ) {
@@ -311,14 +311,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;
@@ -333,12 +333,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();
@@ -349,176 +349,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 ) { ?>
@@ -528,107 +528,107 @@ 
             <?php } ?>
         </select>
     <?php
-    }
+	}
 
 	public static function post_edit_link( $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 '';
-    }
+		$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 '';
+	}
 
 	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
@@ -644,28 +644,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();
@@ -673,75 +673,75 @@ 
 		}
 
 		$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' );
-        $current = trim($current);
-
-        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 ) {
+		$values = self::recursive_function_map( $values, 'trim' );
+		$current = trim($current);
+
+		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 ) {
 		_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 ) ) {
@@ -771,334 +771,334 @@ 
 		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();
-            $user_id = $user_ID;
+			$user_ID = get_current_user_id();
+			$user_id = $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
-     */
-    public static function get_unique_key( $name = '', $table_name, $column, $id = 0, $num_chars = 6 ) {
-        global $wpdb;
-
-        $key = '';
-
-        if ( ! empty( $name ) ) {
-            $key = sanitize_key($name);
-        }
+		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
+	 */
+	public static function get_unique_key( $name = '', $table_name, $column, $id = 0, $num_chars = 6 ) {
+		global $wpdb;
+
+		$key = '';
+
+		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;
-        }
-
-        global $frm_vars;
-
-        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;
+		}
+
+		global $frm_vars;
+
+		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' );
@@ -1106,69 +1106,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];
@@ -1180,18 +1180,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 );
 
@@ -1200,8 +1200,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 ) ) {
@@ -1225,117 +1225,117 @@ 
 		return date_i18n( $date_format, strtotime( $date ) );
 	}
 
-    /**
-     * @return string The time ago in words
-     */
-    public static function human_time_diff( $from, $to = '' ) {
-    	if ( empty($to) ) {
-    	    		$to = time();
-    	}
-
-    	// Array of time period chunks
-    	$chunks = array(
-    		array( 60 * 60 * 24 * 365, __( 'year', 'formidable' ), __( 'years', 'formidable' ) ),
-    		array( 60 * 60 * 24 * 30, __( 'month', 'formidable' ), __( 'months', 'formidable' ) ),
-    		array( 60 * 60 * 24 * 7, __( 'week', 'formidable' ), __( 'weeks', 'formidable' ) ),
-    		array( 60 * 60 * 24, __( 'day', 'formidable' ), __( 'days', 'formidable' ) ),
-    		array( 60 * 60, __( 'hour', 'formidable' ), __( 'hours', 'formidable' ) ),
-    		array( 60, __( 'minute', 'formidable' ), __( 'minutes', 'formidable' ) ),
-    		array( 1, __( 'second', 'formidable' ), __( 'seconds', 'formidable' ) ),
-    	);
-
-    	// Difference in seconds
-    	$diff = (int) ($to - $from);
-
-    	// Something went wrong with date calculation and we ended up with a negative date.
+	/**
+	 * @return string The time ago in words
+	 */
+	public static function human_time_diff( $from, $to = '' ) {
+		if ( empty($to) ) {
+					$to = time();
+		}
+
+		// Array of time period chunks
+		$chunks = array(
+			array( 60 * 60 * 24 * 365, __( 'year', 'formidable' ), __( 'years', 'formidable' ) ),
+			array( 60 * 60 * 24 * 30, __( 'month', 'formidable' ), __( 'months', 'formidable' ) ),
+			array( 60 * 60 * 24 * 7, __( 'week', 'formidable' ), __( 'weeks', 'formidable' ) ),
+			array( 60 * 60 * 24, __( 'day', 'formidable' ), __( 'days', 'formidable' ) ),
+			array( 60 * 60, __( 'hour', 'formidable' ), __( 'hours', 'formidable' ) ),
+			array( 60, __( 'minute', 'formidable' ), __( 'minutes', 'formidable' ) ),
+			array( 1, __( 'second', 'formidable' ), __( 'seconds', 'formidable' ) ),
+		);
+
+		// Difference in seconds
+		$diff = (int) ($to - $from);
+
+		// Something went wrong with date calculation and we ended up with a negative date.
 		if ( $diff < 1 ) {
 			return '0 ' . __( 'seconds', 'formidable' );
-    	}
+		}
 
-    	/**
-    	 * We only want to output one chunks of time here, eg:
-    	 * x years
-    	 * xx months
-    	 * so there's only one bit of calculation below:
-    	 */
+		/**
+		 * We only want to output one chunks of time here, eg:
+		 * x years
+		 * xx months
+		 * so there's only one bit of calculation below:
+		 */
 
-        $count = 0;
+		$count = 0;
 
-    	//Step one: the first chunk
+		//Step one: the first chunk
 		for ( $i = 0, $j = count( $chunks ); $i < $j; $i++ ) {
-    		$seconds = $chunks[ $i ][0];
-
-    		// Finding the biggest chunk (if the chunk fits, break)
-    		if ( ( $count = floor($diff / $seconds) ) != 0 ) {
-    		    			break;
-    		}
-    	}
-
-    	// Set output var
-    	$output = ( 1 == $count ) ? '1 '. $chunks[ $i ][1] : $count . ' ' . $chunks[ $i ][2];
-
-    	if ( ! (int) trim( $output ) ) {
-    		$output = '0 ' . __( 'seconds', 'formidable' );
-        }
-
-    	return $output;
-    }
-
-    /**
-     * Added for < WP 4.0 compatability
-     *
-     * @since 1.07.10
-     *
-     * @param string $term The value to escape
-     * @return string The escaped value
-     */
+			$seconds = $chunks[ $i ][0];
+
+			// Finding the biggest chunk (if the chunk fits, break)
+			if ( ( $count = floor($diff / $seconds) ) != 0 ) {
+							break;
+			}
+		}
+
+		// Set output var
+		$output = ( 1 == $count ) ? '1 '. $chunks[ $i ][1] : $count . ' ' . $chunks[ $i ][2];
+
+		if ( ! (int) trim( $output ) ) {
+			$output = '0 ' . __( 'seconds', 'formidable' );
+		}
+
+		return $output;
+	}
+
+	/**
+	 * 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
@@ -1347,183 +1347,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
@@ -1539,35 +1539,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 ] ) ) {
@@ -1635,64 +1635,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
@@ -1701,9 +1701,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 );
@@ -1753,81 +1753,81 @@ 
 		}
 	}
 
-    /**
-     * @since 1.07.10
-     *
-     * @param float $min_version The version the add-on requires
-     * @return echo The message on the plugins listing page
-     */
+	/**
+	 * @since 1.07.10
+	 *
+	 * @param float $min_version The version the add-on requires
+	 * @return echo The message on the plugins listing page
+	 */
 	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 +226 added lines, -226 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' );
     }
 
     /**
@@ -67,7 +67,7 @@ 
      */
     public static function get_settings() {
         global $frm_settings;
-        if ( empty($frm_settings) ) {
+        if ( empty( $frm_settings ) ) {
             $frm_settings = new FrmSettings();
         }
         return $frm_settings;
@@ -83,7 +83,7 @@ 
     }
 
     public static function pro_is_installed() {
-        return apply_filters('frm_pro_installed', false);
+        return apply_filters( 'frm_pro_installed', false );
     }
 
     /**
@@ -127,7 +127,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();
     }
 
 	/**
@@ -147,7 +147,7 @@ 
      * @return boolean
      */
     public static function is_admin() {
-        return is_admin() && ( ! defined('DOING_AJAX') || ! DOING_AJAX );
+        return is_admin() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX );
     }
 
     /**
@@ -173,7 +173,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] ) : '';
     }
 
     /**
@@ -188,14 +188,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;
                 }
             }
@@ -205,15 +205,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 {
@@ -222,12 +222,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;
             }
         }
 
@@ -269,16 +269,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']];
 			}
 		}
 
@@ -314,8 +314,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 );
             }
         }
     }
@@ -323,7 +323,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 );
 		}
 	}
 
@@ -343,7 +343,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 );
@@ -354,7 +354,7 @@ 
      * @since 2.0
      */
     public static function remove_get_action() {
-        if ( ! isset($_GET) ) {
+        if ( ! isset( $_GET ) ) {
             return;
         }
 
@@ -376,8 +376,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;
@@ -388,9 +388,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' );
         }
     }
 
@@ -406,16 +406,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() ) {
@@ -439,9 +439,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;
@@ -452,8 +452,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 );
     }
 
     /**
@@ -467,9 +467,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;
         }
@@ -500,29 +500,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 } ?>
@@ -531,26 +531,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();
@@ -558,10 +558,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 );
         }
     }
 
@@ -617,7 +617,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;
         }
 
@@ -626,7 +626,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 );
         }
     }
 
@@ -651,12 +651,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 );
         }
     }
 
@@ -673,11 +673,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;
         }
@@ -693,9 +693,9 @@ 
 
 	public static function check_selected( $values, $current ) {
         $values = self::recursive_function_map( $values, 'trim' );
-        $current = trim($current);
+        $current = trim( $current );
 
-        return ( is_array($values) && in_array($current, $values) ) || ( ! is_array($values) && $values == $current );
+        return ( is_array( $values ) && in_array( $current, $values ) ) || ( ! is_array( $values ) && $values == $current );
     }
 
     /**
@@ -756,7 +756,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 );
 					}
 				}
 			}
@@ -777,11 +777,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;
 				}
@@ -791,7 +791,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 );
     }
@@ -801,8 +801,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;
     }
@@ -820,8 +820,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;
     }
 
@@ -836,11 +836,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;
     	}
@@ -853,7 +853,7 @@ 
     }
 
 	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;
         }
 
@@ -861,29 +861,29 @@ 
             $user_ID = get_current_user_id();
             $user_id = $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;
@@ -899,28 +899,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;
@@ -938,32 +938,32 @@ 
 
         global $frm_vars;
 
-        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 );
@@ -980,8 +980,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 ) );
@@ -990,8 +990,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,
@@ -999,7 +999,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,
@@ -1009,38 +1009,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'] );
         }
     }
 
@@ -1059,18 +1059,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 );
     }
 
     /**
@@ -1080,23 +1080,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 );
         }
     }
 
@@ -1112,9 +1112,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
     }
@@ -1142,7 +1142,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 = '';
@@ -1151,23 +1151,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 ) {
@@ -1180,17 +1180,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 );
@@ -1205,7 +1205,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 );
@@ -1229,7 +1229,7 @@ 
      * @return string The time ago in words
      */
     public static function human_time_diff( $from, $to = '' ) {
-    	if ( empty($to) ) {
+    	if ( empty( $to ) ) {
     	    		$to = time();
     	}
 
@@ -1245,7 +1245,7 @@ 
     	);
 
     	// Difference in seconds
-    	$diff = (int) ($to - $from);
+    	$diff = (int) ( $to - $from );
 
     	// Something went wrong with date calculation and we ended up with a negative date.
 		if ( $diff < 1 ) {
@@ -1262,17 +1262,17 @@ 
         $count = 0;
 
     	//Step one: the first chunk
-		for ( $i = 0, $j = count( $chunks ); $i < $j; $i++ ) {
-    		$seconds = $chunks[ $i ][0];
+		for ( $i = 0, $j = count( $chunks ); $i < $j; $i ++ ) {
+    		$seconds = $chunks[$i][0];
 
     		// Finding the biggest chunk (if the chunk fits, break)
-    		if ( ( $count = floor($diff / $seconds) ) != 0 ) {
+    		if ( ( $count = floor( $diff / $seconds ) ) != 0 ) {
     		    			break;
     		}
     	}
 
     	// Set output var
-    	$output = ( 1 == $count ) ? '1 '. $chunks[ $i ][1] : $count . ' ' . $chunks[ $i ][2];
+    	$output = ( 1 == $count ) ? '1 ' . $chunks[$i][1] : $count . ' ' . $chunks[$i][2];
 
     	if ( ! (int) trim( $output ) ) {
     		$output = '0 ' . __( 'seconds', 'formidable' );
@@ -1291,7 +1291,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 {
@@ -1305,17 +1305,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',
@@ -1323,18 +1323,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;
     }
 
 	/**
@@ -1351,24 +1351,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;
     }
 
     /**
@@ -1376,12 +1376,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 '';
         }
 
@@ -1427,7 +1427,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' );
     }
 
 	/**
@@ -1436,19 +1436,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;
                 }
 
@@ -1462,24 +1462,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;
@@ -1492,8 +1492,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;
         }
     }
 
@@ -1508,7 +1508,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;
         }
 
@@ -1518,7 +1518,7 @@ 
             echo ' class="frm_help"';
         }
 
-        echo ' title="'. esc_attr( $tooltips[ $name ] );
+        echo ' title="' . esc_attr( $tooltips[$name] );
 
         if ( 'open' != $class ) {
             echo '"';
@@ -1570,13 +1570,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 {
@@ -1584,7 +1584,7 @@ 
 			$val = stripslashes( $val );
 
 			// Add backslashes before double quotes and forward slashes only
-			$post_content[ $key ] = addcslashes( $val, '"\\/' );
+			$post_content[$key] = addcslashes( $val, '"\\/' );
 		}
 	}
 
@@ -1601,7 +1601,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
@@ -1635,17 +1635,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;
         }
@@ -1661,11 +1661,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;
         }
 
@@ -1763,11 +1763,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>';
@@ -1775,38 +1775,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' ) {
@@ -1825,8 +1825,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 +214 added lines, -214 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,89 +34,89 @@ 
 			$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)
-            $values = apply_filters( 'frm_prepare_data_before_db', $values, $field_id, $entry_id );
+		foreach ( $values as $field_id => $meta_value ) {
+			// set the value for the file upload field and add new tags (in Pro version)
+			$values = apply_filters( 'frm_prepare_data_before_db', $values, $field_id, $entry_id );
 
-            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
+			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 ] );
-                } else {
-                    // if value exists, then update it
+				} else {
+					// if value exists, then update it
 					self::update_entry_meta( $entry_id, $field_id, '', $values[ $field_id ] );
-                }
-            } else {
-                // if value does not exist, then create it
+				}
+			} else {
+				// if value does not exist, then create it
 				self::add_entry_meta( $entry_id, $field_id, '', $values[ $field_id ] );
-            }
-        }
+			}
+		}
 
-        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
@@ -141,7 +141,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;
@@ -154,24 +154,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' );
@@ -179,117 +179,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 );
@@ -300,91 +300,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 +76 added lines, -76 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,48 +49,48 @@ 
 
         $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)
             $values = apply_filters( 'frm_prepare_data_before_db', $values, $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, '', $values[ $field_id ] );
+					self::update_entry_meta( $entry_id, $field_id, '', $values[$field_id] );
                 }
             } else {
                 // if value does not exist, then create it
-				self::add_entry_meta( $entry_id, $field_id, '', $values[ $field_id ] );
+				self::add_entry_meta( $entry_id, $field_id, '', $values[$field_id] );
             }
         }
 
-        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;
         }
 
@@ -104,10 +104,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();
     }
@@ -115,7 +115,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 ) );
     }
 
 	/**
@@ -134,7 +134,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 );
 		}
@@ -152,14 +152,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';
@@ -167,8 +167,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;
     }
@@ -179,7 +179,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' );
@@ -190,22 +190,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 );
     }
 
     /**
@@ -216,16 +216,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'] ) {
@@ -233,7 +233,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;
     }
@@ -246,19 +246,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;
@@ -270,14 +270,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;
     }
@@ -300,23 +300,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;
         }
@@ -328,27 +328,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;
         }
@@ -363,27 +363,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 +315 added lines, -315 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,264 +217,264 @@ 
 	}
 
 	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_desc_size'    => '14px',
-            'form_desc_color'   => '666666',
-
-            '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',
-            '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',
-            'bg_color_active'   => 'ffffff',
+			'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_desc_size'    => '14px',
+			'form_desc_color'   => '666666',
+
+			'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',
+			'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',
+			'bg_color_active'   => 'ffffff',
 			'border_color_active' => '66afe9',
-            '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 +61 added lines, -61 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,30 +100,30 @@ 
      * 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) ) {
+        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 );
 		}
@@ -138,8 +138,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 ) {
@@ -149,33 +149,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
@@ -217,7 +217,7 @@ 
 	}
 
 	public function destroy( $id ) {
-        return wp_delete_post($id);
+        return wp_delete_post( $id );
     }
 
     public function get_one() {
@@ -231,19 +231,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;
     }
@@ -257,21 +257,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;
 
@@ -295,25 +295,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 );
         }
 
@@ -325,24 +325,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'];
@@ -477,7 +477,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/FrmEntriesController.php

Indentation +362 added lines, -362 removed lines

@@ -2,199 +2,199 @@ 
 
 class FrmEntriesController {
 
-    public static function menu() {
+	public static function menu() {
 		FrmAppHelper::force_capability( 'frm_view_entries' );
 
-        add_submenu_page('formidable', 'Formidable | '. __( 'Entries', 'formidable' ), __( 'Entries', 'formidable' ), 'frm_view_entries', 'formidable-entries', 'FrmEntriesController::route' );
+		add_submenu_page('formidable', 'Formidable | '. __( 'Entries', 'formidable' ), __( 'Entries', 'formidable' ), 'frm_view_entries', 'formidable-entries', 'FrmEntriesController::route' );
 
 		if ( ! in_array( FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ), array( 'edit', 'show' ) ) ) {
-            $frm_settings = FrmAppHelper::get_settings();
+			$frm_settings = FrmAppHelper::get_settings();
 			add_filter( 'manage_' . sanitize_title( $frm_settings->menu ) . '_page_formidable-entries_columns', 'FrmEntriesController::manage_columns' );
 			add_filter( 'get_user_option_manage' . sanitize_title( $frm_settings->menu ) . '_page_formidable-entriescolumnshidden', 'FrmEntriesController::hidden_columns' );
 			add_filter( 'manage_' . sanitize_title( $frm_settings->menu ) . '_page_formidable-entries_sortable_columns', 'FrmEntriesController::sortable_columns' );
-        }
-    }
+		}
+	}
 
-    /* Display in Back End */
-    public static function route() {
+	/* Display in Back End */
+	public static function route() {
 		$action = FrmAppHelper::get_param( 'frm_action', '', 'get', 'sanitize_title' );
 
-        switch ( $action ) {
-            case 'show':
-            case 'destroy':
-            case 'destroy_all':
-                return self::$action();
+		switch ( $action ) {
+			case 'show':
+			case 'destroy':
+			case 'destroy_all':
+				return self::$action();
 
-            default:
-                do_action( 'frm_entry_action_route', $action );
-                if ( apply_filters( 'frm_entry_stop_action_route', false, $action ) ) {
-                    return;
-                }
+			default:
+				do_action( 'frm_entry_action_route', $action );
+				if ( apply_filters( 'frm_entry_stop_action_route', false, $action ) ) {
+					return;
+				}
 
-                return self::display_list();
-        }
-    }
+				return self::display_list();
+		}
+	}
 
 	public static function contextual_help( $help, $screen_id, $screen ) {
-        // Only add to certain screens. add_help_tab was introduced in WordPress 3.3
-        if ( $screen_id != 'formidable_page_formidable-entries' || ! method_exists( $screen, 'add_help_tab' ) ) {
-            return $help;
-        }
+		// Only add to certain screens. add_help_tab was introduced in WordPress 3.3
+		if ( $screen_id != 'formidable_page_formidable-entries' || ! method_exists( $screen, 'add_help_tab' ) ) {
+			return $help;
+		}
 
 		$action = FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' );
 		$page = FrmAppHelper::simple_get( 'page', 'sanitize_title' );
 		if ( $page != 'formidable-entries' || ( ! empty( $action ) && $action != 'list' ) ) {
-            return $help;
-        }
+			return $help;
+		}
 		unset( $action, $page );
 
-        $screen->add_help_tab( array(
-            'id'      => 'formidable-entries-tab',
-            'title'   => __( 'Overview', 'formidable' ),
+		$screen->add_help_tab( array(
+			'id'      => 'formidable-entries-tab',
+			'title'   => __( 'Overview', 'formidable' ),
 			'content' => '<p>' . esc_html__( 'This screen provides access to all of your entries. You can customize the display of this screen to suit your workflow.', 'formidable' ) .'</p> <p>'. esc_html__( 'Hovering over a row in the entries list will display action links that allow you to manage your entry.', 'formidable' ) . '</p>',
-        ));
+		));
 
-        $screen->set_help_sidebar(
+		$screen->set_help_sidebar(
 			'<p><strong>' . esc_html__( 'For more information:', 'formidable' ) . '</strong></p>' .
 			'<p><a href="http://formidablepro.com/knowledgebase/manage-entries-from-the-back-end/" target="_blank">' . esc_html__( 'Documentation on Entries', 'formidable' ) . '</a></p>' .
 			'<p><a href="http://formidablepro.com/help-topics/" target="_blank">' . esc_html__( 'Support', 'formidable' ) . '</a></p>'
-    	);
+		);
 
-        return $help;
-    }
+		return $help;
+	}
 
 	public static function manage_columns( $columns ) {
-        global $frm_vars, $wpdb;
+		global $frm_vars, $wpdb;
 		$form_id = FrmForm::get_current_form_id();
 
-        $columns[ $form_id .'_id' ] = 'ID';
+		$columns[ $form_id .'_id' ] = 'ID';
 		$columns[ $form_id . '_item_key' ] = esc_html__( 'Entry Key', 'formidable' );
 
-        if ( ! $form_id ) {
-            return $columns;
-        }
+		if ( ! $form_id ) {
+			return $columns;
+		}
 
-        $form_cols = FrmField::get_all_for_form($form_id, '', 'include');
+		$form_cols = FrmField::get_all_for_form($form_id, '', 'include');
 
-        foreach ( $form_cols as $form_col ) {
+		foreach ( $form_cols as $form_col ) {
 			if ( FrmField::is_no_save_field( $form_col->type ) ) {
-                continue;
-            }
+				continue;
+			}
 
-            if ( $form_col->type == 'form' && isset( $form_col->field_options['form_select'] ) && ! empty( $form_col->field_options['form_select'] ) ) {
+			if ( $form_col->type == 'form' && isset( $form_col->field_options['form_select'] ) && ! empty( $form_col->field_options['form_select'] ) ) {
 				$sub_form_cols = FrmField::get_all_for_form( $form_col->field_options['form_select'] );
 
-                if ( $sub_form_cols ) {
-                    foreach ( $sub_form_cols as $k => $sub_form_col ) {
+				if ( $sub_form_cols ) {
+					foreach ( $sub_form_cols as $k => $sub_form_col ) {
 						if ( FrmField::is_no_save_field( $sub_form_col->type ) ) {
-                            unset( $sub_form_cols[ $k ] );
-                            continue;
-                        }
+							unset( $sub_form_cols[ $k ] );
+							continue;
+						}
 						$columns[ $form_id . '_' . $sub_form_col->field_key . '-_-' . $form_col->id ] = FrmAppHelper::truncate( $sub_form_col->name, 35 );
-                        unset($sub_form_col);
-                    }
-                }
-                unset($sub_form_cols);
-            } else {
-                $col_id = $form_col->field_key;
-                if ( $form_col->form_id != $form_id ) {
-                    $col_id .= '-_-form'. $form_col->form_id;
-                }
-
-                if ( isset($form_col->field_options['separate_value']) && $form_col->field_options['separate_value'] ) {
-                    $columns[ $form_id .'_frmsep_'. $col_id ] = FrmAppHelper::truncate( $form_col->name, 35 );
-                }
-                $columns[ $form_id .'_'. $col_id ] = FrmAppHelper::truncate( $form_col->name, 35 );
-            }
-        }
-
-        $columns[ $form_id .'_created_at' ] = __( 'Entry creation date', 'formidable' );
-        $columns[ $form_id .'_updated_at' ] = __( 'Entry update date', 'formidable' );
-        $columns[ $form_id .'_ip' ] = 'IP';
-
-        $frm_vars['cols'] = $columns;
+						unset($sub_form_col);
+					}
+				}
+				unset($sub_form_cols);
+			} else {
+				$col_id = $form_col->field_key;
+				if ( $form_col->form_id != $form_id ) {
+					$col_id .= '-_-form'. $form_col->form_id;
+				}
+
+				if ( isset($form_col->field_options['separate_value']) && $form_col->field_options['separate_value'] ) {
+					$columns[ $form_id .'_frmsep_'. $col_id ] = FrmAppHelper::truncate( $form_col->name, 35 );
+				}
+				$columns[ $form_id .'_'. $col_id ] = FrmAppHelper::truncate( $form_col->name, 35 );
+			}
+		}
+
+		$columns[ $form_id .'_created_at' ] = __( 'Entry creation date', 'formidable' );
+		$columns[ $form_id .'_updated_at' ] = __( 'Entry update date', 'formidable' );
+		$columns[ $form_id .'_ip' ] = 'IP';
+
+		$frm_vars['cols'] = $columns;
 
 		$action = FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' );
 		if ( FrmAppHelper::is_admin_page( 'formidable-entries' ) && in_array( $action, array( '', 'list', 'destroy' ) ) ) {
 			add_screen_option( 'per_page', array( 'label' => __( 'Entries', 'formidable' ), 'default' => 20, 'option' => 'formidable_page_formidable_entries_per_page' ) );
-        }
+		}
 
-        return $columns;
-    }
+		return $columns;
+	}
 
 	public static function check_hidden_cols( $check, $object_id, $meta_key, $meta_value, $prev_value ) {
-        $frm_settings = FrmAppHelper::get_settings();
-        if ( $meta_key != 'manage'.  sanitize_title($frm_settings->menu) .'_page_formidable-entriescolumnshidden' || $meta_value == $prev_value ) {
-            return $check;
-        }
+		$frm_settings = FrmAppHelper::get_settings();
+		if ( $meta_key != 'manage'.  sanitize_title($frm_settings->menu) .'_page_formidable-entriescolumnshidden' || $meta_value == $prev_value ) {
+			return $check;
+		}
 
 		if ( empty( $prev_value ) ) {
-            		$prev_value = get_metadata('user', $object_id, $meta_key, true);
-        }
+					$prev_value = get_metadata('user', $object_id, $meta_key, true);
+		}
 
-        global $frm_vars;
-        //add a check so we don't create a loop
-        $frm_vars['prev_hidden_cols'] = ( isset($frm_vars['prev_hidden_cols']) && $frm_vars['prev_hidden_cols'] ) ? false : $prev_value;
+		global $frm_vars;
+		//add a check so we don't create a loop
+		$frm_vars['prev_hidden_cols'] = ( isset($frm_vars['prev_hidden_cols']) && $frm_vars['prev_hidden_cols'] ) ? false : $prev_value;
 
-        return $check;
-    }
+		return $check;
+	}
 
-    //add hidden columns back from other forms
+	//add hidden columns back from other forms
 	public static function update_hidden_cols( $meta_id, $object_id, $meta_key, $meta_value ) {
-        $frm_settings = FrmAppHelper::get_settings();
-
-        $sanitized = sanitize_title($frm_settings->menu);
-        if ( $meta_key != 'manage'.  $sanitized .'_page_formidable-entriescolumnshidden' ) {
-            return;
-        }
-
-        global $frm_vars;
-        if ( ! isset($frm_vars['prev_hidden_cols']) || ! $frm_vars['prev_hidden_cols'] ) {
-            return; //don't continue if there's no previous value
-        }
-
-        foreach ( $meta_value as $mk => $mv ) {
-            //remove blank values
-            if ( empty( $mv )  ) {
-                unset( $meta_value[ $mk ] );
-            }
-        }
-
-        $cur_form_prefix = reset($meta_value);
-        $cur_form_prefix = explode('_', $cur_form_prefix);
-        $cur_form_prefix = $cur_form_prefix[0];
-        $save = false;
-
-        foreach ( (array) $frm_vars['prev_hidden_cols'] as $prev_hidden ) {
+		$frm_settings = FrmAppHelper::get_settings();
+
+		$sanitized = sanitize_title($frm_settings->menu);
+		if ( $meta_key != 'manage'.  $sanitized .'_page_formidable-entriescolumnshidden' ) {
+			return;
+		}
+
+		global $frm_vars;
+		if ( ! isset($frm_vars['prev_hidden_cols']) || ! $frm_vars['prev_hidden_cols'] ) {
+			return; //don't continue if there's no previous value
+		}
+
+		foreach ( $meta_value as $mk => $mv ) {
+			//remove blank values
+			if ( empty( $mv )  ) {
+				unset( $meta_value[ $mk ] );
+			}
+		}
+
+		$cur_form_prefix = reset($meta_value);
+		$cur_form_prefix = explode('_', $cur_form_prefix);
+		$cur_form_prefix = $cur_form_prefix[0];
+		$save = false;
+
+		foreach ( (array) $frm_vars['prev_hidden_cols'] as $prev_hidden ) {
 			if ( empty( $prev_hidden ) || in_array( $prev_hidden, $meta_value ) ) {
-                //don't add blank cols or process included cols
-                continue;
-            }
+				//don't add blank cols or process included cols
+				continue;
+			}
 
 			$form_prefix = explode( '_', $prev_hidden );
-            $form_prefix = $form_prefix[0];
-            if ( $form_prefix == $cur_form_prefix ) {
-                //don't add back columns that are meant to be hidden
-                continue;
-            }
+			$form_prefix = $form_prefix[0];
+			if ( $form_prefix == $cur_form_prefix ) {
+				//don't add back columns that are meant to be hidden
+				continue;
+			}
 
-            $meta_value[] = $prev_hidden;
-            $save = true;
-            unset($form_prefix);
-        }
+			$meta_value[] = $prev_hidden;
+			$save = true;
+			unset($form_prefix);
+		}
 
 		if ( $save ) {
-            $user = wp_get_current_user();
-            update_user_option( $user->ID, 'manage'.  $sanitized .'_page_formidable-entriescolumnshidden', $meta_value, true );
-        }
-    }
+			$user = wp_get_current_user();
+			update_user_option( $user->ID, 'manage'.  $sanitized .'_page_formidable-entriescolumnshidden', $meta_value, true );
+		}
+	}
 
 	public static function save_per_page( $save, $option, $value ) {
-        if ( $option == 'formidable_page_formidable_entries_per_page' ) {
-            $save = (int) $value;
-        }
-        return $save;
-    }
+		if ( $option == 'formidable_page_formidable_entries_per_page' ) {
+			$save = (int) $value;
+		}
+		return $save;
+	}
 
 	public static function sortable_columns() {
 		$form_id = FrmForm::get_current_form_id();
@@ -220,226 +220,226 @@ 
 	}
 
 	public static function hidden_columns( $result ) {
-        global $frm_vars;
+		global $frm_vars;
 
 		$form_id = FrmForm::get_current_form_id();
 
-        $return = false;
-        foreach ( (array) $result as $r ) {
-            if ( ! empty( $r ) ) {
-                $form_prefix = explode( '_', $r );
-                $form_prefix = $form_prefix[0];
+		$return = false;
+		foreach ( (array) $result as $r ) {
+			if ( ! empty( $r ) ) {
+				$form_prefix = explode( '_', $r );
+				$form_prefix = $form_prefix[0];
 
-                if ( (int) $form_prefix == (int) $form_id ) {
-                    $return = true;
-                    break;
-                }
+				if ( (int) $form_prefix == (int) $form_id ) {
+					$return = true;
+					break;
+				}
 
-                unset($form_prefix);
-            }
-        }
+				unset($form_prefix);
+			}
+		}
 
-        if ( $return ) {
+		if ( $return ) {
 			return $result;
 		}
 
-        $i = isset($frm_vars['cols']) ? count($frm_vars['cols']) : 0;
-        $max_columns = 8;
-        if ( $i <= $max_columns ) {
+		$i = isset($frm_vars['cols']) ? count($frm_vars['cols']) : 0;
+		$max_columns = 8;
+		if ( $i <= $max_columns ) {
 			return $result;
 		}
 
-        global $frm_vars;
-        if ( isset($frm_vars['current_form']) && $frm_vars['current_form'] ) {
-            $frm_vars['current_form']->options = maybe_unserialize($frm_vars['current_form']->options);
-        }
+		global $frm_vars;
+		if ( isset($frm_vars['current_form']) && $frm_vars['current_form'] ) {
+			$frm_vars['current_form']->options = maybe_unserialize($frm_vars['current_form']->options);
+		}
 
-        if ( isset($frm_vars['current_form']) && $frm_vars['current_form'] && isset($frm_vars['current_form']->options['hidden_cols']) && ! empty($frm_vars['current_form']->options['hidden_cols']) ) {
-            $result = $frm_vars['current_form']->options['hidden_cols'];
-        } else {
-            $cols = $frm_vars['cols'];
-            $cols = array_reverse($cols, true);
+		if ( isset($frm_vars['current_form']) && $frm_vars['current_form'] && isset($frm_vars['current_form']->options['hidden_cols']) && ! empty($frm_vars['current_form']->options['hidden_cols']) ) {
+			$result = $frm_vars['current_form']->options['hidden_cols'];
+		} else {
+			$cols = $frm_vars['cols'];
+			$cols = array_reverse($cols, true);
 
-            $result[] = $form_id .'_id';
-            $i--;
+			$result[] = $form_id .'_id';
+			$i--;
 
-            $result[] = $form_id .'_item_key';
-            $i--;
+			$result[] = $form_id .'_item_key';
+			$i--;
 
 			foreach ( $cols as $col_key => $col ) {
-                if ( $i > $max_columns ) {
+				if ( $i > $max_columns ) {
 					$result[] = $col_key;
 				}
-                //remove some columns by default
-                $i--;
-                unset($col_key, $col);
-            }
-        }
+				//remove some columns by default
+				$i--;
+				unset($col_key, $col);
+			}
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
 	public static function display_list( $message = '', $errors = array() ) {
-        global $wpdb, $frm_vars;
+		global $wpdb, $frm_vars;
 
 		$form = FrmForm::get_current_form();
 		$params = FrmForm::get_admin_params( $form );
 
-        if ( $form ) {
-            $params['form'] = $form->id;
-            $frm_vars['current_form'] = $form;
+		if ( $form ) {
+			$params['form'] = $form->id;
+			$frm_vars['current_form'] = $form;
 
-	        if ( 'trash' == $form->status ) {
-	            $delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
-	            $time_to_delete = FrmAppHelper::human_time_diff( $delete_timestamp, ( isset( $form->options['trash_time'] ) ? ( $form->options['trash_time'] ) : time() ) );
-	            $errors['trash'] = sprintf( __( 'This form is in the trash and is scheduled to be deleted permanently in %s along with any entries.', 'formidable' ), $time_to_delete );
-	            unset( $time_to_delete, $delete_timestamp );
-	        }
+			if ( 'trash' == $form->status ) {
+				$delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
+				$time_to_delete = FrmAppHelper::human_time_diff( $delete_timestamp, ( isset( $form->options['trash_time'] ) ? ( $form->options['trash_time'] ) : time() ) );
+				$errors['trash'] = sprintf( __( 'This form is in the trash and is scheduled to be deleted permanently in %s along with any entries.', 'formidable' ), $time_to_delete );
+				unset( $time_to_delete, $delete_timestamp );
+			}
 		}
 
-        $table_class = apply_filters( 'frm_entries_list_class', 'FrmEntriesListHelper' );
+		$table_class = apply_filters( 'frm_entries_list_class', 'FrmEntriesListHelper' );
 
-        $wp_list_table = new $table_class( array( 'params' => $params ) );
+		$wp_list_table = new $table_class( array( 'params' => $params ) );
 
-        $pagenum = $wp_list_table->get_pagenum();
+		$pagenum = $wp_list_table->get_pagenum();
 
-        $wp_list_table->prepare_items();
+		$wp_list_table->prepare_items();
 
-        $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-        if ( $pagenum > $total_pages && $total_pages > 0 ) {
+		$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
+		if ( $pagenum > $total_pages && $total_pages > 0 ) {
 			$url = add_query_arg( 'paged', $total_pages );
-            if ( headers_sent() ) {
-                echo FrmAppHelper::js_redirect($url);
-            } else {
-                wp_redirect( esc_url_raw( $url ) );
-            }
-            die();
-        }
-
-        if ( empty($message) && isset($_GET['import-message']) ) {
-            $message = __( 'Your import is complete', 'formidable' );
-        }
-
-        require(FrmAppHelper::plugin_path() .'/classes/views/frm-entries/list.php');
-    }
-
-    /* Back End CRUD */
+			if ( headers_sent() ) {
+				echo FrmAppHelper::js_redirect($url);
+			} else {
+				wp_redirect( esc_url_raw( $url ) );
+			}
+			die();
+		}
+
+		if ( empty($message) && isset($_GET['import-message']) ) {
+			$message = __( 'Your import is complete', 'formidable' );
+		}
+
+		require(FrmAppHelper::plugin_path() .'/classes/views/frm-entries/list.php');
+	}
+
+	/* Back End CRUD */
 	public static function show( $id = 0 ) {
-        FrmAppHelper::permission_check('frm_view_entries');
+		FrmAppHelper::permission_check('frm_view_entries');
 
-        if ( ! $id ) {
+		if ( ! $id ) {
 			$id = FrmAppHelper::get_param( 'id', 0, 'get', 'absint' );
 
-            if ( ! $id ) {
+			if ( ! $id ) {
 				$id = FrmAppHelper::get_param( 'item_id', 0, 'get', 'absint' );
-            }
-        }
+			}
+		}
 
-        $entry = FrmEntry::getOne($id, true);
+		$entry = FrmEntry::getOne($id, true);
 
-        $data = maybe_unserialize($entry->description);
+		$data = maybe_unserialize($entry->description);
 		if ( ! is_array( $data ) || ! isset( $data['referrer'] ) ) {
 			$data = array( 'referrer' => $data );
 		}
 
 		$fields = FrmField::get_all_for_form( $entry->form_id, '', 'include' );
-        $to_emails = array();
+		$to_emails = array();
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-entries/show.php');
-    }
+		include(FrmAppHelper::plugin_path() .'/classes/views/frm-entries/show.php');
+	}
 
-    public static function destroy() {
-        FrmAppHelper::permission_check('frm_delete_entries');
+	public static function destroy() {
+		FrmAppHelper::permission_check('frm_delete_entries');
 
 		$params = FrmForm::get_admin_params();
 
-        if ( isset($params['keep_post']) && $params['keep_post'] ) {
-            //unlink entry from post
-            global $wpdb;
+		if ( isset($params['keep_post']) && $params['keep_post'] ) {
+			//unlink entry from post
+			global $wpdb;
 			$wpdb->update( $wpdb->prefix .'frm_items', array( 'post_id' => '' ), array( 'id' => $params['id'] ) );
-        }
+		}
 
-        $message = '';
-        if ( FrmEntry::destroy( $params['id'] ) ) {
-            $message = __( 'Entry was Successfully Destroyed', 'formidable' );
-        }
+		$message = '';
+		if ( FrmEntry::destroy( $params['id'] ) ) {
+			$message = __( 'Entry was Successfully Destroyed', 'formidable' );
+		}
 
-        self::display_list( $message );
-    }
+		self::display_list( $message );
+	}
 
-    public static function destroy_all() {
-        if ( ! current_user_can( 'frm_delete_entries' ) ) {
-            $frm_settings = FrmAppHelper::get_settings();
-            wp_die( $frm_settings->admin_permission );
-        }
+	public static function destroy_all() {
+		if ( ! current_user_can( 'frm_delete_entries' ) ) {
+			$frm_settings = FrmAppHelper::get_settings();
+			wp_die( $frm_settings->admin_permission );
+		}
 
-        global $wpdb;
+		global $wpdb;
 		$params = FrmForm::get_admin_params();
-        $message = '';
-        $errors = array();
-        $form_id = (int) $params['form'];
+		$message = '';
+		$errors = array();
+		$form_id = (int) $params['form'];
 
-        if ( $form_id ) {
-            $entry_ids = FrmDb::get_col( 'frm_items', array( 'form_id' => $form_id ) );
+		if ( $form_id ) {
+			$entry_ids = FrmDb::get_col( 'frm_items', array( 'form_id' => $form_id ) );
 			$action = FrmFormAction::get_action_for_form( $form_id, 'wppost', 1 );
 
-            if ( $action ) {
-                // this action takes a while, so only trigger it if there are posts to delete
-                foreach ( $entry_ids as $entry_id ) {
-                    do_action( 'frm_before_destroy_entry', $entry_id );
-                    unset( $entry_id );
-                }
-            }
-
-            $wpdb->query( $wpdb->prepare( "DELETE em.* FROM {$wpdb->prefix}frm_item_metas as em INNER JOIN {$wpdb->prefix}frm_items as e on (em.item_id=e.id) and form_id=%d", $form_id ) );
-            $results = $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}frm_items WHERE form_id=%d", $form_id ) );
-            if ( $results ) {
-                $message = __( 'Entries were Successfully Destroyed', 'formidable' );
-            }
-        } else {
-            $errors = __( 'No entries were specified', 'formidable' );
-        }
-
-        self::display_list( $message, $errors );
-    }
-
-    public static function show_form( $id = '', $key = '', $title = false, $description = false ) {
-        _deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::show_form()' );
-        return FrmFormsController::show_form( $id, $key, $title, $description );
-    }
-
-    public static function get_form( $filename, $form, $title, $description ) {
-        _deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::get_form()' );
-        return FrmFormsController::get_form( $form, $title, $description );
-    }
-
-    public static function process_entry( $errors = '', $ajax = false ) {
+			if ( $action ) {
+				// this action takes a while, so only trigger it if there are posts to delete
+				foreach ( $entry_ids as $entry_id ) {
+					do_action( 'frm_before_destroy_entry', $entry_id );
+					unset( $entry_id );
+				}
+			}
+
+			$wpdb->query( $wpdb->prepare( "DELETE em.* FROM {$wpdb->prefix}frm_item_metas as em INNER JOIN {$wpdb->prefix}frm_items as e on (em.item_id=e.id) and form_id=%d", $form_id ) );
+			$results = $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}frm_items WHERE form_id=%d", $form_id ) );
+			if ( $results ) {
+				$message = __( 'Entries were Successfully Destroyed', 'formidable' );
+			}
+		} else {
+			$errors = __( 'No entries were specified', 'formidable' );
+		}
+
+		self::display_list( $message, $errors );
+	}
+
+	public static function show_form( $id = '', $key = '', $title = false, $description = false ) {
+		_deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::show_form()' );
+		return FrmFormsController::show_form( $id, $key, $title, $description );
+	}
+
+	public static function get_form( $filename, $form, $title, $description ) {
+		_deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::get_form()' );
+		return FrmFormsController::get_form( $form, $title, $description );
+	}
+
+	public static function process_entry( $errors = '', $ajax = false ) {
 		$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
 		if ( FrmAppHelper::is_admin() || empty( $_POST ) || empty( $form_id ) || ! isset( $_POST['item_key'] ) ) {
-            return;
-        }
+			return;
+		}
 
-        global $frm_vars;
+		global $frm_vars;
 
 		$form = FrmForm::getOne( $form_id );
-        if ( ! $form ) {
-            return;
-        }
+		if ( ! $form ) {
+			return;
+		}
 
 		$params = FrmForm::get_params( $form );
 
-        if ( ! isset( $frm_vars['form_params'] ) ) {
-            $frm_vars['form_params'] = array();
-        }
+		if ( ! isset( $frm_vars['form_params'] ) ) {
+			$frm_vars['form_params'] = array();
+		}
 		$frm_vars['form_params'][ $form->id ] = $params;
 
 		if ( isset( $frm_vars['created_entries'][ $form_id ] ) ) {
-            return;
-        }
+			return;
+		}
 
-        if ( $errors == '' ) {
+		if ( $errors == '' ) {
 			$errors = FrmEntryValidate::validate( $_POST );
-        }
+		}
 
 		/**
 		 * Use this filter to add trigger actions and add errors after
@@ -450,102 +450,102 @@ 
 
 		$frm_vars['created_entries'][ $form_id ] = array( 'errors' => $errors );
 
-        if ( empty( $errors ) ) {
+		if ( empty( $errors ) ) {
 			$_POST['frm_skip_cookie'] = 1;
-            if ( $params['action'] == 'create' ) {
+			if ( $params['action'] == 'create' ) {
 				if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) {
 					$frm_vars['created_entries'][ $form_id ]['entry_id'] = FrmEntry::create( $_POST );
-                }
-            }
+				}
+			}
 
-            do_action( 'frm_process_entry', $params, $errors, $form, array( 'ajax' => $ajax ) );
+			do_action( 'frm_process_entry', $params, $errors, $form, array( 'ajax' => $ajax ) );
 			unset( $_POST['frm_skip_cookie'] );
-        }
-    }
-
-    public static function delete_entry_before_redirect( $url, $form, $atts ) {
-        self::_delete_entry( $atts['id'], $form );
-        return $url;
-    }
-
-    //Delete entry if not redirected
-    public static function delete_entry_after_save( $atts ) {
-        self::_delete_entry( $atts['entry_id'], $atts['form'] );
-    }
-
-    private static function _delete_entry( $entry_id, $form ) {
-        if ( ! $form ) {
-            return;
-        }
-
-        $form->options = maybe_unserialize( $form->options );
-        if ( isset( $form->options['no_save'] ) && $form->options['no_save'] ) {
-            FrmEntry::destroy( $entry_id );
-        }
-    }
+		}
+	}
+
+	public static function delete_entry_before_redirect( $url, $form, $atts ) {
+		self::_delete_entry( $atts['id'], $form );
+		return $url;
+	}
+
+	//Delete entry if not redirected
+	public static function delete_entry_after_save( $atts ) {
+		self::_delete_entry( $atts['entry_id'], $atts['form'] );
+	}
+
+	private static function _delete_entry( $entry_id, $form ) {
+		if ( ! $form ) {
+			return;
+		}
+
+		$form->options = maybe_unserialize( $form->options );
+		if ( isset( $form->options['no_save'] ) && $form->options['no_save'] ) {
+			FrmEntry::destroy( $entry_id );
+		}
+	}
 
 	public static function show_entry_shortcode( $atts ) {
 		return FrmEntryFormat::show_entry( $atts );
 	}
 
-    public static function &filter_email_value( $value, $meta, $entry, $atts = array() ) {
-        $field = FrmField::getOne($meta->field_id);
-        if ( ! $field ) {
-            return $value;
-        }
+	public static function &filter_email_value( $value, $meta, $entry, $atts = array() ) {
+		$field = FrmField::getOne($meta->field_id);
+		if ( ! $field ) {
+			return $value;
+		}
 
-        $value = self::filter_display_value($value, $field, $atts);
-        return $value;
-    }
+		$value = self::filter_display_value($value, $field, $atts);
+		return $value;
+	}
 
 	public static function &filter_shortcode_value( $value, $tag, $atts, $field ) {
-        $plain_text = add_filter('frm_plain_text_email', true);
+		$plain_text = add_filter('frm_plain_text_email', true);
 		FrmEntryFormat::textarea_display_value( $field->type, $plain_text, $value );
 
-        if ( isset($atts['show']) && $atts['show'] == 'value' ) {
-            return $value;
-        }
+		if ( isset($atts['show']) && $atts['show'] == 'value' ) {
+			return $value;
+		}
 
-        return self::filter_display_value($value, $field, $atts);
-    }
+		return self::filter_display_value($value, $field, $atts);
+	}
 
-    public static function &filter_display_value( $value, $field, $atts = array() ) {
-        $saved_value = ( isset($atts['saved_value']) && $atts['saved_value'] ) ? true : false;
+	public static function &filter_display_value( $value, $field, $atts = array() ) {
+		$saved_value = ( isset($atts['saved_value']) && $atts['saved_value'] ) ? true : false;
 		if ( ! in_array( $field->type, array( 'radio', 'checkbox', 'radio', 'select' ) ) || ! FrmField::is_option_true( $field, 'separate_value' ) || $saved_value ) {
-            return $value;
-        }
-
-        $f_values = $f_labels = array();
-
-        foreach ( $field->options as $opt_key => $opt ) {
-            if ( ! is_array($opt) ) {
-                continue;
-            }
-
-            $f_labels[ $opt_key ] = isset( $opt['label'] ) ? $opt['label'] : reset($opt);
-            $f_values[ $opt_key ] = isset( $opt['value'] ) ? $opt['value'] : $f_labels[ $opt_key ];
-            if ( $f_labels[ $opt_key ] == $f_values[ $opt_key ] ) {
-                unset( $f_values[ $opt_key ], $f_labels[ $opt_key ] );
-            }
-            unset($opt_key, $opt);
-        }
-
-        if ( ! empty($f_values) ) {
-            foreach ( (array) $value as $v_key => $val ) {
-                if ( in_array($val, $f_values) ) {
-                    $opt = array_search($val, $f_values);
-                    if ( is_array($value) ) {
-                        $value[ $v_key ] = $f_labels[ $opt ];
-                    } else {
-                        $value = $f_labels[ $opt ];
-                    }
-                }
-                unset($v_key, $val);
-            }
-        }
-
-        return $value;
-    }
+			return $value;
+		}
+
+		$f_values = $f_labels = array();
+
+		foreach ( $field->options as $opt_key => $opt ) {
+			if ( ! is_array($opt) ) {
+				continue;
+			}
+
+			$f_labels[ $opt_key ] = isset( $opt['label'] ) ? $opt['label'] : reset($opt);
+			$f_values[ $opt_key ] = isset( $opt['value'] ) ? $opt['value'] : $f_labels[ $opt_key ];
+			if ( $f_labels[ $opt_key ] == $f_values[ $opt_key ] ) {
+				unset( $f_values[ $opt_key ], $f_labels[ $opt_key ] );
+			}
+			unset($opt_key, $opt);
+		}
+
+		if ( ! empty($f_values) ) {
+			foreach ( (array) $value as $v_key => $val ) {
+				if ( in_array($val, $f_values) ) {
+					$opt = array_search($val, $f_values);
+					if ( is_array($value) ) {
+						$value[ $v_key ] = $f_labels[ $opt ];
+					} else {
+						$value = $f_labels[ $opt ];
+					}
+				}
+				unset($v_key, $val);
+			}
+		}
+
+		return $value;
+	}
 
 	public static function get_params( $form = null ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmForm::get_params' );
@@ -553,13 +553,13 @@ 
 	}
 
 	public static function entry_sidebar( $entry ) {
-        $data = maybe_unserialize($entry->description);
-        $date_format = get_option('date_format');
-        $time_format = get_option('time_format');
+		$data = maybe_unserialize($entry->description);
+		$date_format = get_option('date_format');
+		$time_format = get_option('time_format');
 		if ( isset( $data['browser'] ) ) {
 			$browser = FrmEntryFormat::get_browser( $data['browser'] );
 		}
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-entries/sidebar-shared.php');
-    }
+		include(FrmAppHelper::plugin_path() .'/classes/views/frm-entries/sidebar-shared.php');
+	}
 }

Spacing +80 added lines, -80 removed lines

@@ -5,7 +5,7 @@ 
     public static function menu() {
 		FrmAppHelper::force_capability( 'frm_view_entries' );
 
-        add_submenu_page('formidable', 'Formidable | '. __( 'Entries', 'formidable' ), __( 'Entries', 'formidable' ), 'frm_view_entries', 'formidable-entries', 'FrmEntriesController::route' );
+        add_submenu_page( 'formidable', 'Formidable | ' . __( 'Entries', 'formidable' ), __( 'Entries', 'formidable' ), 'frm_view_entries', 'formidable-entries', 'FrmEntriesController::route' );
 
 		if ( ! in_array( FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ), array( 'edit', 'show' ) ) ) {
             $frm_settings = FrmAppHelper::get_settings();
@@ -51,8 +51,8 @@ 
         $screen->add_help_tab( array(
             'id'      => 'formidable-entries-tab',
             'title'   => __( 'Overview', 'formidable' ),
-			'content' => '<p>' . esc_html__( 'This screen provides access to all of your entries. You can customize the display of this screen to suit your workflow.', 'formidable' ) .'</p> <p>'. esc_html__( 'Hovering over a row in the entries list will display action links that allow you to manage your entry.', 'formidable' ) . '</p>',
-        ));
+			'content' => '<p>' . esc_html__( 'This screen provides access to all of your entries. You can customize the display of this screen to suit your workflow.', 'formidable' ) . '</p> <p>' . esc_html__( 'Hovering over a row in the entries list will display action links that allow you to manage your entry.', 'formidable' ) . '</p>',
+        ) );
 
         $screen->set_help_sidebar(
 			'<p><strong>' . esc_html__( 'For more information:', 'formidable' ) . '</strong></p>' .
@@ -67,14 +67,14 @@ 
         global $frm_vars, $wpdb;
 		$form_id = FrmForm::get_current_form_id();
 
-        $columns[ $form_id .'_id' ] = 'ID';
-		$columns[ $form_id . '_item_key' ] = esc_html__( 'Entry Key', 'formidable' );
+        $columns[$form_id . '_id'] = 'ID';
+		$columns[$form_id . '_item_key'] = esc_html__( 'Entry Key', 'formidable' );
 
         if ( ! $form_id ) {
             return $columns;
         }
 
-        $form_cols = FrmField::get_all_for_form($form_id, '', 'include');
+        $form_cols = FrmField::get_all_for_form( $form_id, '', 'include' );
 
         foreach ( $form_cols as $form_col ) {
 			if ( FrmField::is_no_save_field( $form_col->type ) ) {
@@ -87,30 +87,30 @@ 
                 if ( $sub_form_cols ) {
                     foreach ( $sub_form_cols as $k => $sub_form_col ) {
 						if ( FrmField::is_no_save_field( $sub_form_col->type ) ) {
-                            unset( $sub_form_cols[ $k ] );
+                            unset( $sub_form_cols[$k] );
                             continue;
                         }
-						$columns[ $form_id . '_' . $sub_form_col->field_key . '-_-' . $form_col->id ] = FrmAppHelper::truncate( $sub_form_col->name, 35 );
-                        unset($sub_form_col);
+						$columns[$form_id . '_' . $sub_form_col->field_key . '-_-' . $form_col->id] = FrmAppHelper::truncate( $sub_form_col->name, 35 );
+                        unset( $sub_form_col );
                     }
                 }
-                unset($sub_form_cols);
+                unset( $sub_form_cols );
             } else {
                 $col_id = $form_col->field_key;
                 if ( $form_col->form_id != $form_id ) {
-                    $col_id .= '-_-form'. $form_col->form_id;
+                    $col_id .= '-_-form' . $form_col->form_id;
                 }
 
-                if ( isset($form_col->field_options['separate_value']) && $form_col->field_options['separate_value'] ) {
-                    $columns[ $form_id .'_frmsep_'. $col_id ] = FrmAppHelper::truncate( $form_col->name, 35 );
+                if ( isset( $form_col->field_options['separate_value'] ) && $form_col->field_options['separate_value'] ) {
+                    $columns[$form_id . '_frmsep_' . $col_id] = FrmAppHelper::truncate( $form_col->name, 35 );
                 }
-                $columns[ $form_id .'_'. $col_id ] = FrmAppHelper::truncate( $form_col->name, 35 );
+                $columns[$form_id . '_' . $col_id] = FrmAppHelper::truncate( $form_col->name, 35 );
             }
         }
 
-        $columns[ $form_id .'_created_at' ] = __( 'Entry creation date', 'formidable' );
-        $columns[ $form_id .'_updated_at' ] = __( 'Entry update date', 'formidable' );
-        $columns[ $form_id .'_ip' ] = 'IP';
+        $columns[$form_id . '_created_at'] = __( 'Entry creation date', 'formidable' );
+        $columns[$form_id . '_updated_at'] = __( 'Entry update date', 'formidable' );
+        $columns[$form_id . '_ip'] = 'IP';
 
         $frm_vars['cols'] = $columns;
 
@@ -124,17 +124,17 @@ 
 
 	public static function check_hidden_cols( $check, $object_id, $meta_key, $meta_value, $prev_value ) {
         $frm_settings = FrmAppHelper::get_settings();
-        if ( $meta_key != 'manage'.  sanitize_title($frm_settings->menu) .'_page_formidable-entriescolumnshidden' || $meta_value == $prev_value ) {
+        if ( $meta_key != 'manage' . sanitize_title( $frm_settings->menu ) . '_page_formidable-entriescolumnshidden' || $meta_value == $prev_value ) {
             return $check;
         }
 
 		if ( empty( $prev_value ) ) {
-            		$prev_value = get_metadata('user', $object_id, $meta_key, true);
+            		$prev_value = get_metadata( 'user', $object_id, $meta_key, true );
         }
 
         global $frm_vars;
         //add a check so we don't create a loop
-        $frm_vars['prev_hidden_cols'] = ( isset($frm_vars['prev_hidden_cols']) && $frm_vars['prev_hidden_cols'] ) ? false : $prev_value;
+        $frm_vars['prev_hidden_cols'] = ( isset( $frm_vars['prev_hidden_cols'] ) && $frm_vars['prev_hidden_cols'] ) ? false : $prev_value;
 
         return $check;
     }
@@ -143,25 +143,25 @@ 
 	public static function update_hidden_cols( $meta_id, $object_id, $meta_key, $meta_value ) {
         $frm_settings = FrmAppHelper::get_settings();
 
-        $sanitized = sanitize_title($frm_settings->menu);
-        if ( $meta_key != 'manage'.  $sanitized .'_page_formidable-entriescolumnshidden' ) {
+        $sanitized = sanitize_title( $frm_settings->menu );
+        if ( $meta_key != 'manage' . $sanitized . '_page_formidable-entriescolumnshidden' ) {
             return;
         }
 
         global $frm_vars;
-        if ( ! isset($frm_vars['prev_hidden_cols']) || ! $frm_vars['prev_hidden_cols'] ) {
+        if ( ! isset( $frm_vars['prev_hidden_cols'] ) || ! $frm_vars['prev_hidden_cols'] ) {
             return; //don't continue if there's no previous value
         }
 
         foreach ( $meta_value as $mk => $mv ) {
             //remove blank values
-            if ( empty( $mv )  ) {
-                unset( $meta_value[ $mk ] );
+            if ( empty( $mv ) ) {
+                unset( $meta_value[$mk] );
             }
         }
 
-        $cur_form_prefix = reset($meta_value);
-        $cur_form_prefix = explode('_', $cur_form_prefix);
+        $cur_form_prefix = reset( $meta_value );
+        $cur_form_prefix = explode( '_', $cur_form_prefix );
         $cur_form_prefix = $cur_form_prefix[0];
         $save = false;
 
@@ -180,12 +180,12 @@ 
 
             $meta_value[] = $prev_hidden;
             $save = true;
-            unset($form_prefix);
+            unset( $form_prefix );
         }
 
 		if ( $save ) {
             $user = wp_get_current_user();
-            update_user_option( $user->ID, 'manage'.  $sanitized .'_page_formidable-entriescolumnshidden', $meta_value, true );
+            update_user_option( $user->ID, 'manage' . $sanitized . '_page_formidable-entriescolumnshidden', $meta_value, true );
         }
     }
 
@@ -212,7 +212,7 @@ 
 		foreach ( $fields as $field ) {
 			if ( $field->type != 'checkbox' && ( ! isset( $field->field_options['post_field'] ) || $field->field_options['post_field'] == '' ) ) {
 				// Can't sort on checkboxes because they are stored serialized, or post fields
-				$columns[ $form_id . '_' . $field->field_key ] = 'meta_' . $field->id;
+				$columns[$form_id . '_' . $field->field_key] = 'meta_' . $field->id;
 			}
 		}
 
@@ -235,7 +235,7 @@ 
                     break;
                 }
 
-                unset($form_prefix);
+                unset( $form_prefix );
             }
         }
 
@@ -243,36 +243,36 @@ 
 			return $result;
 		}
 
-        $i = isset($frm_vars['cols']) ? count($frm_vars['cols']) : 0;
+        $i = isset( $frm_vars['cols'] ) ? count( $frm_vars['cols'] ) : 0;
         $max_columns = 8;
         if ( $i <= $max_columns ) {
 			return $result;
 		}
 
         global $frm_vars;
-        if ( isset($frm_vars['current_form']) && $frm_vars['current_form'] ) {
-            $frm_vars['current_form']->options = maybe_unserialize($frm_vars['current_form']->options);
+        if ( isset( $frm_vars['current_form'] ) && $frm_vars['current_form'] ) {
+            $frm_vars['current_form']->options = maybe_unserialize( $frm_vars['current_form']->options );
         }
 
-        if ( isset($frm_vars['current_form']) && $frm_vars['current_form'] && isset($frm_vars['current_form']->options['hidden_cols']) && ! empty($frm_vars['current_form']->options['hidden_cols']) ) {
+        if ( isset( $frm_vars['current_form'] ) && $frm_vars['current_form'] && isset( $frm_vars['current_form']->options['hidden_cols'] ) && ! empty( $frm_vars['current_form']->options['hidden_cols'] ) ) {
             $result = $frm_vars['current_form']->options['hidden_cols'];
         } else {
             $cols = $frm_vars['cols'];
-            $cols = array_reverse($cols, true);
+            $cols = array_reverse( $cols, true );
 
-            $result[] = $form_id .'_id';
-            $i--;
+            $result[] = $form_id . '_id';
+            $i --;
 
-            $result[] = $form_id .'_item_key';
-            $i--;
+            $result[] = $form_id . '_item_key';
+            $i --;
 
 			foreach ( $cols as $col_key => $col ) {
                 if ( $i > $max_columns ) {
 					$result[] = $col_key;
 				}
                 //remove some columns by default
-                $i--;
-                unset($col_key, $col);
+                $i --;
+                unset( $col_key, $col );
             }
         }
 
@@ -309,23 +309,23 @@ 
         if ( $pagenum > $total_pages && $total_pages > 0 ) {
 			$url = add_query_arg( 'paged', $total_pages );
             if ( headers_sent() ) {
-                echo FrmAppHelper::js_redirect($url);
+                echo FrmAppHelper::js_redirect( $url );
             } else {
                 wp_redirect( esc_url_raw( $url ) );
             }
             die();
         }
 
-        if ( empty($message) && isset($_GET['import-message']) ) {
+        if ( empty( $message ) && isset( $_GET['import-message'] ) ) {
             $message = __( 'Your import is complete', 'formidable' );
         }
 
-        require(FrmAppHelper::plugin_path() .'/classes/views/frm-entries/list.php');
+        require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/list.php' );
     }
 
     /* Back End CRUD */
 	public static function show( $id = 0 ) {
-        FrmAppHelper::permission_check('frm_view_entries');
+        FrmAppHelper::permission_check( 'frm_view_entries' );
 
         if ( ! $id ) {
 			$id = FrmAppHelper::get_param( 'id', 0, 'get', 'absint' );
@@ -335,9 +335,9 @@ 
             }
         }
 
-        $entry = FrmEntry::getOne($id, true);
+        $entry = FrmEntry::getOne( $id, true );
 
-        $data = maybe_unserialize($entry->description);
+        $data = maybe_unserialize( $entry->description );
 		if ( ! is_array( $data ) || ! isset( $data['referrer'] ) ) {
 			$data = array( 'referrer' => $data );
 		}
@@ -345,18 +345,18 @@ 
 		$fields = FrmField::get_all_for_form( $entry->form_id, '', 'include' );
         $to_emails = array();
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-entries/show.php');
+        include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/show.php' );
     }
 
     public static function destroy() {
-        FrmAppHelper::permission_check('frm_delete_entries');
+        FrmAppHelper::permission_check( 'frm_delete_entries' );
 
 		$params = FrmForm::get_admin_params();
 
-        if ( isset($params['keep_post']) && $params['keep_post'] ) {
+        if ( isset( $params['keep_post'] ) && $params['keep_post'] ) {
             //unlink entry from post
             global $wpdb;
-			$wpdb->update( $wpdb->prefix .'frm_items', array( 'post_id' => '' ), array( 'id' => $params['id'] ) );
+			$wpdb->update( $wpdb->prefix . 'frm_items', array( 'post_id' => '' ), array( 'id' => $params['id'] ) );
         }
 
         $message = '';
@@ -431,9 +431,9 @@ 
         if ( ! isset( $frm_vars['form_params'] ) ) {
             $frm_vars['form_params'] = array();
         }
-		$frm_vars['form_params'][ $form->id ] = $params;
+		$frm_vars['form_params'][$form->id] = $params;
 
-		if ( isset( $frm_vars['created_entries'][ $form_id ] ) ) {
+		if ( isset( $frm_vars['created_entries'][$form_id] ) ) {
             return;
         }
 
@@ -448,13 +448,13 @@ 
 		 */
 		$errors = apply_filters( 'frm_entries_before_create', $errors, $form );
 
-		$frm_vars['created_entries'][ $form_id ] = array( 'errors' => $errors );
+		$frm_vars['created_entries'][$form_id] = array( 'errors' => $errors );
 
         if ( empty( $errors ) ) {
 			$_POST['frm_skip_cookie'] = 1;
             if ( $params['action'] == 'create' ) {
-				if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) {
-					$frm_vars['created_entries'][ $form_id ]['entry_id'] = FrmEntry::create( $_POST );
+				if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][$form_id]['entry_id'] ) ) {
+					$frm_vars['created_entries'][$form_id]['entry_id'] = FrmEntry::create( $_POST );
                 }
             }
 
@@ -489,28 +489,28 @@ 
 	}
 
     public static function &filter_email_value( $value, $meta, $entry, $atts = array() ) {
-        $field = FrmField::getOne($meta->field_id);
+        $field = FrmField::getOne( $meta->field_id );
         if ( ! $field ) {
             return $value;
         }
 
-        $value = self::filter_display_value($value, $field, $atts);
+        $value = self::filter_display_value( $value, $field, $atts );
         return $value;
     }
 
 	public static function &filter_shortcode_value( $value, $tag, $atts, $field ) {
-        $plain_text = add_filter('frm_plain_text_email', true);
+        $plain_text = add_filter( 'frm_plain_text_email', true );
 		FrmEntryFormat::textarea_display_value( $field->type, $plain_text, $value );
 
-        if ( isset($atts['show']) && $atts['show'] == 'value' ) {
+        if ( isset( $atts['show'] ) && $atts['show'] == 'value' ) {
             return $value;
         }
 
-        return self::filter_display_value($value, $field, $atts);
+        return self::filter_display_value( $value, $field, $atts );
     }
 
     public static function &filter_display_value( $value, $field, $atts = array() ) {
-        $saved_value = ( isset($atts['saved_value']) && $atts['saved_value'] ) ? true : false;
+        $saved_value = ( isset( $atts['saved_value'] ) && $atts['saved_value'] ) ? true : false;
 		if ( ! in_array( $field->type, array( 'radio', 'checkbox', 'radio', 'select' ) ) || ! FrmField::is_option_true( $field, 'separate_value' ) || $saved_value ) {
             return $value;
         }
@@ -518,29 +518,29 @@ 
         $f_values = $f_labels = array();
 
         foreach ( $field->options as $opt_key => $opt ) {
-            if ( ! is_array($opt) ) {
+            if ( ! is_array( $opt ) ) {
                 continue;
             }
 
-            $f_labels[ $opt_key ] = isset( $opt['label'] ) ? $opt['label'] : reset($opt);
-            $f_values[ $opt_key ] = isset( $opt['value'] ) ? $opt['value'] : $f_labels[ $opt_key ];
-            if ( $f_labels[ $opt_key ] == $f_values[ $opt_key ] ) {
-                unset( $f_values[ $opt_key ], $f_labels[ $opt_key ] );
+            $f_labels[$opt_key] = isset( $opt['label'] ) ? $opt['label'] : reset( $opt );
+            $f_values[$opt_key] = isset( $opt['value'] ) ? $opt['value'] : $f_labels[$opt_key];
+            if ( $f_labels[$opt_key] == $f_values[$opt_key] ) {
+                unset( $f_values[$opt_key], $f_labels[$opt_key] );
             }
-            unset($opt_key, $opt);
+            unset( $opt_key, $opt );
         }
 
-        if ( ! empty($f_values) ) {
+        if ( ! empty( $f_values ) ) {
             foreach ( (array) $value as $v_key => $val ) {
-                if ( in_array($val, $f_values) ) {
-                    $opt = array_search($val, $f_values);
-                    if ( is_array($value) ) {
-                        $value[ $v_key ] = $f_labels[ $opt ];
+                if ( in_array( $val, $f_values ) ) {
+                    $opt = array_search( $val, $f_values );
+                    if ( is_array( $value ) ) {
+                        $value[$v_key] = $f_labels[$opt];
                     } else {
-                        $value = $f_labels[ $opt ];
+                        $value = $f_labels[$opt];
                     }
                 }
-                unset($v_key, $val);
+                unset( $v_key, $val );
             }
         }
 
@@ -553,13 +553,13 @@ 
 	}
 
 	public static function entry_sidebar( $entry ) {
-        $data = maybe_unserialize($entry->description);
-        $date_format = get_option('date_format');
-        $time_format = get_option('time_format');
+        $data = maybe_unserialize( $entry->description );
+        $date_format = get_option( 'date_format' );
+        $time_format = get_option( 'time_format' );
 		if ( isset( $data['browser'] ) ) {
 			$browser = FrmEntryFormat::get_browser( $data['browser'] );
 		}
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-entries/sidebar-shared.php');
+        include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/sidebar-shared.php' );
     }
 }

classes/controllers/FrmFormActionsController.php

Indentation +223 added lines, -223 removed lines

@@ -1,109 +1,109 @@ 
 <?php
 
 class FrmFormActionsController {
-    public static $action_post_type = 'frm_form_actions';
-    public static $registered_actions;
-
-    public static function register_post_types() {
-        register_post_type( self::$action_post_type, array(
-            'label' => __( 'Form Actions', 'formidable' ),
-            'description' => '',
-            'public' => false,
-            'show_ui' => false,
-            'exclude_from_search' => true,
-            'show_in_nav_menus' => false,
-            'show_in_menu' => true,
-            'capability_type' => 'page',
-            'supports' => array(
+	public static $action_post_type = 'frm_form_actions';
+	public static $registered_actions;
+
+	public static function register_post_types() {
+		register_post_type( self::$action_post_type, array(
+			'label' => __( 'Form Actions', 'formidable' ),
+			'description' => '',
+			'public' => false,
+			'show_ui' => false,
+			'exclude_from_search' => true,
+			'show_in_nav_menus' => false,
+			'show_in_menu' => true,
+			'capability_type' => 'page',
+			'supports' => array(
 				'title', 'editor', 'excerpt', 'custom-fields',
 				'page-attributes',
-            ),
-            'has_archive' => false,
-        ) );
-
-        /**
-         * post_content: json settings
-         * menu_order: form id
-         * post_excerpt: action type
-         */
-
-        self::actions_init();
-    }
-
-    public static function actions_init() {
-        self::$registered_actions = new Frm_Form_Action_Factory();
-        self::register_actions();
-        do_action( 'frm_form_actions_init' );
-    }
-
-    public static function register_actions() {
-        $action_classes = apply_filters( 'frm_registered_form_actions', array(
-            'email'     => 'FrmEmailAction',
-            'wppost'    => 'FrmDefPostAction',
-            'register'  => 'FrmDefRegAction',
-            'paypal'    => 'FrmDefPayPalAction',
-            //'aweber'    => 'FrmDefAweberAction',
-            'mailchimp' => 'FrmDefMlcmpAction',
-            'twilio'    => 'FrmDefTwilioAction',
-            'highrise'  => 'FrmDefHrsAction',
-        ) );
-
-        include_once(FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/email_action.php');
-        include_once(FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/default_actions.php');
-
-        foreach ( $action_classes as $action_class ) {
-            self::$registered_actions->register($action_class);
-        }
-    }
+			),
+			'has_archive' => false,
+		) );
+
+		/**
+		 * post_content: json settings
+		 * menu_order: form id
+		 * post_excerpt: action type
+		 */
+
+		self::actions_init();
+	}
+
+	public static function actions_init() {
+		self::$registered_actions = new Frm_Form_Action_Factory();
+		self::register_actions();
+		do_action( 'frm_form_actions_init' );
+	}
+
+	public static function register_actions() {
+		$action_classes = apply_filters( 'frm_registered_form_actions', array(
+			'email'     => 'FrmEmailAction',
+			'wppost'    => 'FrmDefPostAction',
+			'register'  => 'FrmDefRegAction',
+			'paypal'    => 'FrmDefPayPalAction',
+			//'aweber'    => 'FrmDefAweberAction',
+			'mailchimp' => 'FrmDefMlcmpAction',
+			'twilio'    => 'FrmDefTwilioAction',
+			'highrise'  => 'FrmDefHrsAction',
+		) );
+
+		include_once(FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/email_action.php');
+		include_once(FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/default_actions.php');
+
+		foreach ( $action_classes as $action_class ) {
+			self::$registered_actions->register($action_class);
+		}
+	}
 
 	public static function get_form_actions( $action = 'all' ) {
-        $temp_actions = self::$registered_actions;
-        if ( empty($temp_actions) ) {
-            self::actions_init();
-            $temp_actions = self::$registered_actions->actions;
-        } else {
-            $temp_actions = $temp_actions->actions;
-        }
+		$temp_actions = self::$registered_actions;
+		if ( empty($temp_actions) ) {
+			self::actions_init();
+			$temp_actions = self::$registered_actions->actions;
+		} else {
+			$temp_actions = $temp_actions->actions;
+		}
 
-        $actions = array();
+		$actions = array();
 
-        foreach ( $temp_actions as $a ) {
-            if ( 'all' != $action && $a->id_base == $action ) {
-                return $a;
-            }
+		foreach ( $temp_actions as $a ) {
+			if ( 'all' != $action && $a->id_base == $action ) {
+				return $a;
+			}
 
 			$actions[ $a->id_base ] = $a;
-        }
-        unset( $temp_actions, $a );
-
-        $action_limit = 10;
-        if ( count( $actions ) <= $action_limit ) {
-            return $actions;
-        }
-
-        // remove the last few inactive icons if there are too many
-        $temp_actions = $actions;
-        arsort( $temp_actions );
-        foreach ( $temp_actions as $type => $a ) {
-            if ( ! isset( $a->action_options['active'] ) || empty( $a->action_options['active'] ) ) {
+		}
+		unset( $temp_actions, $a );
+
+		$action_limit = 10;
+		if ( count( $actions ) <= $action_limit ) {
+			return $actions;
+		}
+
+		// remove the last few inactive icons if there are too many
+		$temp_actions = $actions;
+		arsort( $temp_actions );
+		foreach ( $temp_actions as $type => $a ) {
+			if ( ! isset( $a->action_options['active'] ) || empty( $a->action_options['active'] ) ) {
 				unset( $actions[ $type ] );
-                if ( count( $actions ) <= $action_limit ) {
-                    break;
-                }
-            }
-            unset( $type, $a );
-        }
+				if ( count( $actions ) <= $action_limit ) {
+					break;
+				}
+			}
+			unset( $type, $a );
+		}
 
-        return $actions;
-    }
+		return $actions;
+	}
 
 	/**
 	 * @since 2.0
 	 */
-    public static function list_actions( $form, $values ) {
-        if ( empty( $form ) ) {
-            return;
-        }
+	public static function list_actions( $form, $values ) {
+		if ( empty( $form ) ) {
+			return;
+		}
 
 		/**
 		 * use this hook to migrate old settings into a new action
@@ -113,114 +113,114 @@ 
 
 		$form_actions = FrmFormAction::get_action_for_form( $form->id );
 
-        $action_controls = self::get_form_actions();
+		$action_controls = self::get_form_actions();
 
-        $action_map = array();
+		$action_map = array();
 
 		foreach ( $action_controls as $key => $control ) {
-            $action_map[ $control->id_base ] = $key;
-        }
+			$action_map[ $control->id_base ] = $key;
+		}
 
-    	foreach ( $form_actions as $action ) {
-    	    if ( ! isset( $action_map[ $action->post_excerpt ] ) ) {
-    	        // don't try and show settings if action no longer exists
-    	        continue;
-    	    }
+		foreach ( $form_actions as $action ) {
+			if ( ! isset( $action_map[ $action->post_excerpt ] ) ) {
+				// don't try and show settings if action no longer exists
+				continue;
+			}
 
-    		self::action_control( $action, $form, $action->ID, $action_controls[ $action_map[ $action->post_excerpt ] ], $values );
-    	}
-    }
+			self::action_control( $action, $form, $action->ID, $action_controls[ $action_map[ $action->post_excerpt ] ], $values );
+		}
+	}
 
 	public static function action_control( $form_action, $form, $action_key, $action_control, $values ) {
-        $action_control->_set($action_key);
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-form-actions/form_action.php');
-    }
+		$action_control->_set($action_key);
+		include(FrmAppHelper::plugin_path() .'/classes/views/frm-form-actions/form_action.php');
+	}
 
-    public static function add_form_action() {
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+	public static function add_form_action() {
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        global $frm_vars;
+		global $frm_vars;
 
 		$action_key = absint( $_POST['list_id'] );
-        $action_type = sanitize_text_field( $_POST['type'] );
+		$action_type = sanitize_text_field( $_POST['type'] );
 
-        $action_control = self::get_form_actions( $action_type );
-        $action_control->_set($action_key);
+		$action_control = self::get_form_actions( $action_type );
+		$action_control->_set($action_key);
 
-        $form_id = absint( $_POST['form_id'] );
+		$form_id = absint( $_POST['form_id'] );
 
-        $form_action = $action_control->prepare_new($form_id);
+		$form_action = $action_control->prepare_new($form_id);
 
-        $values = array();
-        $form = self::fields_to_values($form_id, $values);
+		$values = array();
+		$form = self::fields_to_values($form_id, $values);
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-form-actions/form_action.php');
-        wp_die();
-    }
+		include(FrmAppHelper::plugin_path() .'/classes/views/frm-form-actions/form_action.php');
+		wp_die();
+	}
 
-    public static function fill_action() {
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+	public static function fill_action() {
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        $action_key = absint( $_POST['action_id'] );
-        $action_type = sanitize_text_field( $_POST['action_type'] );
+		$action_key = absint( $_POST['action_id'] );
+		$action_type = sanitize_text_field( $_POST['action_type'] );
 
-        $action_control = self::get_form_actions( $action_type );
-        if ( empty($action_control) ) {
-            wp_die();
-        }
+		$action_control = self::get_form_actions( $action_type );
+		if ( empty($action_control) ) {
+			wp_die();
+		}
 
-        $form_action = $action_control->get_single_action( $action_key );
+		$form_action = $action_control->get_single_action( $action_key );
 
-        $values = array();
-        $form = self::fields_to_values($form_action->menu_order, $values);
+		$values = array();
+		$form = self::fields_to_values($form_action->menu_order, $values);
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-form-actions/_action_inside.php');
-        wp_die();
-    }
+		include(FrmAppHelper::plugin_path() .'/classes/views/frm-form-actions/_action_inside.php');
+		wp_die();
+	}
 
 	private static function fields_to_values( $form_id, array &$values ) {
-        $form = FrmForm::getOne($form_id);
+		$form = FrmForm::getOne($form_id);
 
 		$values = array( 'fields' => array(), 'id' => $form->id );
 
-        $fields = FrmField::get_all_for_form($form->id);
-        foreach ( $fields as $k => $f ) {
-            $f = (array) $f;
-            $opts = (array) $f['field_options'];
-            $f = array_merge($opts, $f);
-            if ( ! isset( $f['post_field'] ) ) {
-                $f['post_field'] = '';
-            }
-            $values['fields'][] = $f;
-            unset($k, $f);
-        }
-
-        return $form;
-    }
+		$fields = FrmField::get_all_for_form($form->id);
+		foreach ( $fields as $k => $f ) {
+			$f = (array) $f;
+			$opts = (array) $f['field_options'];
+			$f = array_merge($opts, $f);
+			if ( ! isset( $f['post_field'] ) ) {
+				$f['post_field'] = '';
+			}
+			$values['fields'][] = $f;
+			unset($k, $f);
+		}
+
+		return $form;
+	}
 
 	public static function update_settings( $form_id ) {
-        global $wpdb;
+		global $wpdb;
 
-        $registered_actions = self::$registered_actions->actions;
+		$registered_actions = self::$registered_actions->actions;
 
 		$old_actions = FrmDb::get_col( $wpdb->posts, array( 'post_type' => self::$action_post_type, 'menu_order' => $form_id ), 'ID' );
-        $new_actions = array();
+		$new_actions = array();
 
-        foreach ( $registered_actions as $registered_action ) {
-            $action_ids = $registered_action->update_callback($form_id);
-            if ( ! empty( $action_ids ) ) {
-                $new_actions[] = $action_ids;
-            }
-        }
+		foreach ( $registered_actions as $registered_action ) {
+			$action_ids = $registered_action->update_callback($form_id);
+			if ( ! empty( $action_ids ) ) {
+				$new_actions[] = $action_ids;
+			}
+		}
 
-        //Only use array_merge if there are new actions
-        if ( ! empty( $new_actions ) ) {
-            $new_actions = call_user_func_array( 'array_merge', $new_actions );
-        }
-        $old_actions = array_diff( $old_actions, $new_actions );
+		//Only use array_merge if there are new actions
+		if ( ! empty( $new_actions ) ) {
+			$new_actions = call_user_func_array( 'array_merge', $new_actions );
+		}
+		$old_actions = array_diff( $old_actions, $new_actions );
 
 		self::delete_missing_actions( $old_actions );
-    }
+	}
 
 	public static function delete_missing_actions( $old_actions ) {
 		if ( ! empty( $old_actions ) ) {
@@ -235,36 +235,36 @@ 
 		self::trigger_actions( 'create', $form_id, $entry_id, 'all', $args );
 	}
 
-    /**
-     * @param string $event
-     */
+	/**
+	 * @param string $event
+	 */
 	public static function trigger_actions( $event, $form, $entry, $type = 'all', $args = array() ) {
 		$form_actions = FrmFormAction::get_action_for_form( ( is_object( $form ) ? $form->id : $form ), $type );
 
 		if ( empty( $form_actions ) ) {
-            return;
-        }
+			return;
+		}
 
 		FrmForm::maybe_get_form( $form );
 
-        $link_settings = self::get_form_actions( $type );
-        if ( 'all' != $type ) {
-            $link_settings = array( $type => $link_settings );
-        }
+		$link_settings = self::get_form_actions( $type );
+		if ( 'all' != $type ) {
+			$link_settings = array( $type => $link_settings );
+		}
 
-        $stored_actions = $action_priority = array();
+		$stored_actions = $action_priority = array();
 
 		$importing = in_array( $event, array( 'create', 'update' ) ) && defined( 'WP_IMPORTING' ) && WP_IMPORTING;
 
-        foreach ( $form_actions as $action ) {
+		foreach ( $form_actions as $action ) {
 			$trigger_on_import = $importing && in_array( 'import', $action->post_content['event'] );
 			if ( ! in_array( $event, $action->post_content['event'] ) && ! $trigger_on_import ) {
-                continue;
-            }
+				continue;
+			}
 
-            if ( ! is_object( $entry ) ) {
-                $entry = FrmEntry::getOne( $entry, true );
-            }
+			if ( ! is_object( $entry ) ) {
+				$entry = FrmEntry::getOne( $entry, true );
+			}
 
 			if ( empty( $entry ) || $entry->is_draft ) {
 				continue;
@@ -273,66 +273,66 @@ 
 			$child_entry = ( ( $form && is_numeric( $form->parent_form_id ) && $form->parent_form_id ) || ( $entry && ( $entry->form_id != $form->id || $entry->parent_item_id ) ) || ( isset( $args['is_child'] ) && $args['is_child'] ) );
 
 			if ( $child_entry ) {
-                //don't trigger actions for sub forms
-                continue;
-            }
+				//don't trigger actions for sub forms
+				continue;
+			}
 
-            // check conditional logic
+			// check conditional logic
 			$stop = FrmFormAction::action_conditions_met( $action, $entry );
-            if ( $stop ) {
-                continue;
-            }
+			if ( $stop ) {
+				continue;
+			}
 
-            // store actions so they can be triggered with the correct priority
-            $stored_actions[ $action->ID ] = $action;
-            $action_priority[ $action->ID ] = $link_settings[ $action->post_excerpt ]->action_options['priority'];
+			// store actions so they can be triggered with the correct priority
+			$stored_actions[ $action->ID ] = $action;
+			$action_priority[ $action->ID ] = $link_settings[ $action->post_excerpt ]->action_options['priority'];
 
-            unset($action);
-        }
+			unset($action);
+		}
 
-        if ( ! empty( $stored_actions ) ) {
-            asort($action_priority);
+		if ( ! empty( $stored_actions ) ) {
+			asort($action_priority);
 
-            // make sure hooks are loaded
-            new FrmNotification();
+			// make sure hooks are loaded
+			new FrmNotification();
 
-            foreach ( $action_priority as $action_id => $priority ) {
-                $action = $stored_actions[ $action_id ];
-                do_action('frm_trigger_'. $action->post_excerpt .'_action', $action, $entry, $form, $event);
-                do_action('frm_trigger_'. $action->post_excerpt .'_'. $event .'_action', $action, $entry, $form);
+			foreach ( $action_priority as $action_id => $priority ) {
+				$action = $stored_actions[ $action_id ];
+				do_action('frm_trigger_'. $action->post_excerpt .'_action', $action, $entry, $form, $event);
+				do_action('frm_trigger_'. $action->post_excerpt .'_'. $event .'_action', $action, $entry, $form);
 
-                // If post is created, get updated $entry object
-                if ( $action->post_excerpt == 'wppost' && $event == 'create' ) {
-                    $entry = FrmEntry::getOne($entry->id, true);
-                }
-            }
-        }
-    }
+				// If post is created, get updated $entry object
+				if ( $action->post_excerpt == 'wppost' && $event == 'create' ) {
+					$entry = FrmEntry::getOne($entry->id, true);
+				}
+			}
+		}
+	}
 
 	public static function duplicate_form_actions( $form_id, $values, $args = array() ) {
-        if ( ! isset($args['old_id']) || empty($args['old_id']) ) {
-            // continue if we know which actions to copy
-            return;
-        }
+		if ( ! isset($args['old_id']) || empty($args['old_id']) ) {
+			// continue if we know which actions to copy
+			return;
+		}
 
-        $action_controls = self::get_form_actions( );
+		$action_controls = self::get_form_actions( );
 
-        foreach ( $action_controls as $action_control ) {
-            $action_control->duplicate_form_actions( $form_id, $args['old_id'] );
-            unset( $action_control );
-        }
-    }
+		foreach ( $action_controls as $action_control ) {
+			$action_control->duplicate_form_actions( $form_id, $args['old_id'] );
+			unset( $action_control );
+		}
+	}
 
-    public static function limit_by_type( $where ) {
-        global $frm_vars, $wpdb;
+	public static function limit_by_type( $where ) {
+		global $frm_vars, $wpdb;
 
-        if ( ! isset( $frm_vars['action_type'] ) ) {
-            return $where;
-        }
+		if ( ! isset( $frm_vars['action_type'] ) ) {
+			return $where;
+		}
 
-        $where .= $wpdb->prepare( ' AND post_excerpt = %s ', $frm_vars['action_type'] );
-        return $where;
-    }
+		$where .= $wpdb->prepare( ' AND post_excerpt = %s ', $frm_vars['action_type'] );
+		return $where;
+	}
 }
 
 
@@ -359,7 +359,7 @@ 
 		foreach ( $keys as $key ) {
 			// don't register new action if old action with the same id is already registered
 			if ( ! isset( $this->actions[ $key ] ) ) {
-			    $this->actions[ $key ]->_register();
+				$this->actions[ $key ]->_register();
 			}
 		}
 	}

Spacing +38 added lines, -38 removed lines

@@ -48,17 +48,17 @@ 
             'highrise'  => 'FrmDefHrsAction',
         ) );
 
-        include_once(FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/email_action.php');
-        include_once(FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/default_actions.php');
+        include_once( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/email_action.php' );
+        include_once( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/default_actions.php' );
 
         foreach ( $action_classes as $action_class ) {
-            self::$registered_actions->register($action_class);
+            self::$registered_actions->register( $action_class );
         }
     }
 
 	public static function get_form_actions( $action = 'all' ) {
         $temp_actions = self::$registered_actions;
-        if ( empty($temp_actions) ) {
+        if ( empty( $temp_actions ) ) {
             self::actions_init();
             $temp_actions = self::$registered_actions->actions;
         } else {
@@ -72,7 +72,7 @@ 
                 return $a;
             }
 
-			$actions[ $a->id_base ] = $a;
+			$actions[$a->id_base] = $a;
         }
         unset( $temp_actions, $a );
 
@@ -86,7 +86,7 @@ 
         arsort( $temp_actions );
         foreach ( $temp_actions as $type => $a ) {
             if ( ! isset( $a->action_options['active'] ) || empty( $a->action_options['active'] ) ) {
-				unset( $actions[ $type ] );
+				unset( $actions[$type] );
                 if ( count( $actions ) <= $action_limit ) {
                     break;
                 }
@@ -118,22 +118,22 @@ 
         $action_map = array();
 
 		foreach ( $action_controls as $key => $control ) {
-            $action_map[ $control->id_base ] = $key;
+            $action_map[$control->id_base] = $key;
         }
 
     	foreach ( $form_actions as $action ) {
-    	    if ( ! isset( $action_map[ $action->post_excerpt ] ) ) {
+    	    if ( ! isset( $action_map[$action->post_excerpt] ) ) {
     	        // don't try and show settings if action no longer exists
     	        continue;
     	    }
 
-    		self::action_control( $action, $form, $action->ID, $action_controls[ $action_map[ $action->post_excerpt ] ], $values );
+    		self::action_control( $action, $form, $action->ID, $action_controls[$action_map[$action->post_excerpt]], $values );
     	}
     }
 
 	public static function action_control( $form_action, $form, $action_key, $action_control, $values ) {
-        $action_control->_set($action_key);
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-form-actions/form_action.php');
+        $action_control->_set( $action_key );
+        include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/form_action.php' );
     }
 
     public static function add_form_action() {
@@ -145,16 +145,16 @@ 
         $action_type = sanitize_text_field( $_POST['type'] );
 
         $action_control = self::get_form_actions( $action_type );
-        $action_control->_set($action_key);
+        $action_control->_set( $action_key );
 
         $form_id = absint( $_POST['form_id'] );
 
-        $form_action = $action_control->prepare_new($form_id);
+        $form_action = $action_control->prepare_new( $form_id );
 
         $values = array();
-        $form = self::fields_to_values($form_id, $values);
+        $form = self::fields_to_values( $form_id, $values );
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-form-actions/form_action.php');
+        include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/form_action.php' );
         wp_die();
     }
 
@@ -165,34 +165,34 @@ 
         $action_type = sanitize_text_field( $_POST['action_type'] );
 
         $action_control = self::get_form_actions( $action_type );
-        if ( empty($action_control) ) {
+        if ( empty( $action_control ) ) {
             wp_die();
         }
 
         $form_action = $action_control->get_single_action( $action_key );
 
         $values = array();
-        $form = self::fields_to_values($form_action->menu_order, $values);
+        $form = self::fields_to_values( $form_action->menu_order, $values );
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/frm-form-actions/_action_inside.php');
+        include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/_action_inside.php' );
         wp_die();
     }
 
 	private static function fields_to_values( $form_id, array &$values ) {
-        $form = FrmForm::getOne($form_id);
+        $form = FrmForm::getOne( $form_id );
 
 		$values = array( 'fields' => array(), 'id' => $form->id );
 
-        $fields = FrmField::get_all_for_form($form->id);
+        $fields = FrmField::get_all_for_form( $form->id );
         foreach ( $fields as $k => $f ) {
             $f = (array) $f;
             $opts = (array) $f['field_options'];
-            $f = array_merge($opts, $f);
+            $f = array_merge( $opts, $f );
             if ( ! isset( $f['post_field'] ) ) {
                 $f['post_field'] = '';
             }
             $values['fields'][] = $f;
-            unset($k, $f);
+            unset( $k, $f );
         }
 
         return $form;
@@ -207,7 +207,7 @@ 
         $new_actions = array();
 
         foreach ( $registered_actions as $registered_action ) {
-            $action_ids = $registered_action->update_callback($form_id);
+            $action_ids = $registered_action->update_callback( $form_id );
             if ( ! empty( $action_ids ) ) {
                 $new_actions[] = $action_ids;
             }
@@ -284,33 +284,33 @@ 
             }
 
             // store actions so they can be triggered with the correct priority
-            $stored_actions[ $action->ID ] = $action;
-            $action_priority[ $action->ID ] = $link_settings[ $action->post_excerpt ]->action_options['priority'];
+            $stored_actions[$action->ID] = $action;
+            $action_priority[$action->ID] = $link_settings[$action->post_excerpt]->action_options['priority'];
 
-            unset($action);
+            unset( $action );
         }
 
         if ( ! empty( $stored_actions ) ) {
-            asort($action_priority);
+            asort( $action_priority );
 
             // make sure hooks are loaded
             new FrmNotification();
 
             foreach ( $action_priority as $action_id => $priority ) {
-                $action = $stored_actions[ $action_id ];
-                do_action('frm_trigger_'. $action->post_excerpt .'_action', $action, $entry, $form, $event);
-                do_action('frm_trigger_'. $action->post_excerpt .'_'. $event .'_action', $action, $entry, $form);
+                $action = $stored_actions[$action_id];
+                do_action( 'frm_trigger_' . $action->post_excerpt . '_action', $action, $entry, $form, $event );
+                do_action( 'frm_trigger_' . $action->post_excerpt . '_' . $event . '_action', $action, $entry, $form );
 
                 // If post is created, get updated $entry object
                 if ( $action->post_excerpt == 'wppost' && $event == 'create' ) {
-                    $entry = FrmEntry::getOne($entry->id, true);
+                    $entry = FrmEntry::getOne( $entry->id, true );
                 }
             }
         }
     }
 
 	public static function duplicate_form_actions( $form_id, $values, $args = array() ) {
-        if ( ! isset($args['old_id']) || empty($args['old_id']) ) {
+        if ( ! isset( $args['old_id'] ) || empty( $args['old_id'] ) ) {
             // continue if we know which actions to copy
             return;
         }
@@ -344,22 +344,22 @@ 
 	}
 
 	public function register( $action_class ) {
-		$this->actions[ $action_class ] = new $action_class();
+		$this->actions[$action_class] = new $action_class();
 	}
 
 	public function unregister( $action_class ) {
-		if ( isset( $this->actions[ $action_class ] ) ) {
-			unset($this->actions[ $action_class ]);
+		if ( isset( $this->actions[$action_class] ) ) {
+			unset( $this->actions[$action_class] );
 		}
 	}
 
 	public function _register_actions() {
-		$keys = array_keys($this->actions);
+		$keys = array_keys( $this->actions );
 
 		foreach ( $keys as $key ) {
 			// don't register new action if old action with the same id is already registered
-			if ( ! isset( $this->actions[ $key ] ) ) {
-			    $this->actions[ $key ]->_register();
+			if ( ! isset( $this->actions[$key] ) ) {
+			    $this->actions[$key]->_register();
 			}
 		}
 	}

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/controllers/FrmStylesController.php

Spacing +54 added lines, -54 removed lines

@@ -41,25 +41,25 @@ 
     }
 
     public static function menu() {
-        add_submenu_page('formidable', 'Formidable | '. __( 'Styles', 'formidable' ), __( 'Styles', 'formidable' ), 'frm_change_settings', 'formidable-styles', 'FrmStylesController::route');
+        add_submenu_page( 'formidable', 'Formidable | ' . __( 'Styles', 'formidable' ), __( 'Styles', 'formidable' ), 'frm_change_settings', 'formidable-styles', 'FrmStylesController::route' );
     }
 
     public static function admin_init() {
-        if ( ! FrmAppHelper::is_admin_page('formidable-styles') ) {
+        if ( ! FrmAppHelper::is_admin_page( 'formidable-styles' ) ) {
             return;
         }
 
         self::load_pro_hooks();
-        wp_enqueue_script('jquery-ui-datepicker');
+        wp_enqueue_script( 'jquery-ui-datepicker' );
 
         $version = FrmAppHelper::plugin_version();
 		wp_enqueue_script( 'jquery-frm-themepicker', FrmAppHelper::plugin_url() . '/js/jquery/jquery-ui-themepicker.js', array( 'jquery' ), $version );
 
-        wp_enqueue_style('frm-custom-theme', admin_url('admin-ajax.php') .'?action=frmpro_css');
+        wp_enqueue_style( 'frm-custom-theme', admin_url( 'admin-ajax.php' ) . '?action=frmpro_css' );
 
-        $style = apply_filters('frm_style_head', false);
+        $style = apply_filters( 'frm_style_head', false );
         if ( $style ) {
-            wp_enqueue_style('frm-single-custom-theme', admin_url('admin-ajax.php') .'?action=frmpro_load_css&flat=1&'. http_build_query($style->post_content));
+            wp_enqueue_style( 'frm-single-custom-theme', admin_url( 'admin-ajax.php' ) . '?action=frmpro_load_css&flat=1&' . http_build_query( $style->post_content ) );
         }
     }
 
@@ -129,18 +129,18 @@ 
 
 	public static function new_style( $return = '' ) {
         FrmAppHelper::update_message( __( 'create multiple styling templates', 'formidable' ), 'wrap' );
-        self::load_styler('default');
+        self::load_styler( 'default' );
     }
 
 	public static function duplicate() {
 		FrmAppHelper::update_message( __( 'duplicate styling templates', 'formidable' ), 'wrap' );
-		self::load_styler('default');
+		self::load_styler( 'default' );
 	}
 
 	public static function edit( $style_id = false, $message = '' ) {
         if ( ! $style_id ) {
 			$style_id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
-            if ( empty($style_id) ) {
+            if ( empty( $style_id ) ) {
                 $style_id = 'default';
             }
         }
@@ -148,12 +148,12 @@ 
         if ( 'default' == $style_id ) {
             $style = 'default';
         } else {
-            $frm_style = new FrmStyle($style_id);
+            $frm_style = new FrmStyle( $style_id );
             $style = $frm_style->get_one();
             $style = $style->ID;
         }
 
-        self::load_styler($style, $message);
+        self::load_styler( $style, $message );
     }
 
     public static function save() {
@@ -163,17 +163,17 @@ 
 		$style_nonce = FrmAppHelper::get_post_param( 'frm_style', '', 'sanitize_text_field' );
 
 		if ( $post_id !== false && wp_verify_nonce( $style_nonce, 'frm_style_nonce' ) ) {
-            $id = $frm_style->update($post_id);
-            if ( empty($post_id) && ! empty($id) ) {
+            $id = $frm_style->update( $post_id );
+            if ( empty( $post_id ) && ! empty( $id ) ) {
                 // set the post id to the new style so it will be loaded for editing
-                $post_id = reset($id);
+                $post_id = reset( $id );
             }
             // include the CSS that includes this style
 			echo '<link href="' . esc_url( admin_url( 'admin-ajax.php' ) . '?action=frmpro_css' ) . '" type="text/css" rel="Stylesheet" class="frm-custom-theme" />';
             $message = __( 'Your styling settings have been saved.', 'formidable' );
         }
 
-        return self::edit($post_id, $message);
+        return self::edit( $post_id, $message );
     }
 
 	public static function load_styler( $style, $message = '' ) {
@@ -182,15 +182,15 @@ 
         $frm_style = new FrmStyle();
         $styles = $frm_style->get_all();
 
-        if ( is_numeric($style) ) {
-            $style = $styles[ $style ];
+        if ( is_numeric( $style ) ) {
+            $style = $styles[$style];
         } else if ( 'default' == $style ) {
-            $style = $frm_style->get_default_style($styles);
+            $style = $frm_style->get_default_style( $styles );
         }
 
         self::add_meta_boxes();
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/styles/show.php');
+        include( FrmAppHelper::plugin_path() . '/classes/views/styles/show.php' );
     }
 
 	/**
@@ -200,13 +200,13 @@ 
 	private static function manage( $message = '', $forms = array() ) {
         $frm_style = new FrmStyle();
         $styles = $frm_style->get_all();
-        $default_style = $frm_style->get_default_style($styles);
+        $default_style = $frm_style->get_default_style( $styles );
 
-        if ( empty($forms) ) {
+        if ( empty( $forms ) ) {
             $forms = FrmForm::get_published_forms();
         }
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/styles/manage.php');
+        include( FrmAppHelper::plugin_path() . '/classes/views/styles/manage.php' );
     }
 
     private static function manage_styles() {
@@ -219,31 +219,31 @@ 
 
 		$forms = FrmForm::get_published_forms();
         foreach ( $forms as $form ) {
-            if ( $_POST['style'][ $form->id ] == $_POST['prev_style'][ $form->id ] ) {
+            if ( $_POST['style'][$form->id] == $_POST['prev_style'][$form->id] ) {
                 continue;
             }
 
-            $form->options['custom_style'] = $_POST['style'][ $form->id ];
+            $form->options['custom_style'] = $_POST['style'][$form->id];
 
 			$wpdb->update( $wpdb->prefix . 'frm_forms', array( 'options' => maybe_serialize( $form->options ) ), array( 'id' => $form->id ) );
-            unset($form);
+            unset( $form );
         }
 
         $message = __( 'Your form styles have been saved.', 'formidable' );
-        return self::manage($message, $forms);
+        return self::manage( $message, $forms );
     }
 
     public static function custom_css( $message = '', $style = null ) {
-        wp_enqueue_style('codemirror', FrmAppHelper::plugin_url() . '/css/codemirror.css');
-        wp_enqueue_script('codemirror', FrmAppHelper::plugin_url() . '/js/codemirror/codemirror.js', array(), '4.7');
+        wp_enqueue_style( 'codemirror', FrmAppHelper::plugin_url() . '/css/codemirror.css' );
+        wp_enqueue_script( 'codemirror', FrmAppHelper::plugin_url() . '/js/codemirror/codemirror.js', array(), '4.7' );
         wp_enqueue_script( 'codemirror-css', FrmAppHelper::plugin_url() . '/js/codemirror/css.js', array( 'codemirror' ), '4.7' );
 
-        if ( ! isset($style) ) {
+        if ( ! isset( $style ) ) {
             $frm_style = new FrmStyle();
             $style = $frm_style->get_default_style();
         }
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/styles/custom_css.php');
+        include( FrmAppHelper::plugin_path() . '/classes/views/styles/custom_css.php' );
     }
 
     public static function save_css() {
@@ -253,11 +253,11 @@ 
 		$post_id = FrmAppHelper::get_post_param( 'ID', false, 'sanitize_text_field' );
 		$nonce = FrmAppHelper::get_post_param( 'frm_custom_css', '', 'sanitize_text_field' );
 		if ( wp_verify_nonce( $nonce, 'frm_custom_css_nonce' ) ) {
-            $frm_style->update($post_id);
+            $frm_style->update( $post_id );
             $message = __( 'Your styling settings have been saved.', 'formidable' );
         }
 
-        return self::custom_css($message);
+        return self::custom_css( $message );
     }
 
     public static function route() {
@@ -303,13 +303,13 @@ 
 
         // remove the # from the colors
         foreach ( $_GET['frm_style_setting']['post_content'] as $k => $v ) {
-            if ( ! is_array($v) && strpos($v, '#') === 0 ) {
-                $_GET['frm_style_setting']['post_content'][ $k ] = str_replace( '#', '', $v );
+            if ( ! is_array( $v ) && strpos( $v, '#' ) === 0 ) {
+                $_GET['frm_style_setting']['post_content'][$k] = str_replace( '#', '', $v );
             }
         }
 
         echo '<style type="text/css">';
-        include(FrmAppHelper::plugin_path() .'/css/_single_theme.css.php');
+        include( FrmAppHelper::plugin_path() . '/css/_single_theme.css.php' );
         echo '</style>';
         wp_die();
     }
@@ -331,24 +331,24 @@ 
         );
 
         foreach ( $meta_boxes as $nicename => $name ) {
-            add_meta_box( $nicename .'-style', $name, 'FrmStylesController::include_style_section', self::$screen, 'side', 'default', $nicename );
-            unset($nicename, $name);
+            add_meta_box( $nicename . '-style', $name, 'FrmStylesController::include_style_section', self::$screen, 'side', 'default', $nicename );
+            unset( $nicename, $name );
         }
     }
 
 	public static function include_style_section( $atts, $sec ) {
-        extract($atts);
+        extract( $atts );
 		$current_tab = FrmAppHelper::simple_get( 'page-tab', 'sanitize_title', 'default' );
-        include(FrmAppHelper::plugin_path() .'/classes/views/styles/_'. $sec['args'] .'.php');
+        include( FrmAppHelper::plugin_path() . '/classes/views/styles/_' . $sec['args'] . '.php' );
     }
 
     public static function load_css() {
-        header('Content-type: text/css');
+        header( 'Content-type: text/css' );
 
         $frm_style = new FrmStyle();
         $defaults = $frm_style->get_defaults();
 
-        include(FrmAppHelper::plugin_path() .'/css/_single_theme.css.php');
+        include( FrmAppHelper::plugin_path() . '/css/_single_theme.css.php' );
         wp_die();
     }
 
@@ -407,11 +407,11 @@ 
             $style = 'default';
         }
 
-        $frm_style = new FrmStyle($style);
+        $frm_style = new FrmStyle( $style );
         $style = $frm_style->get_one();
 
         if ( $style ) {
-            $class .= ' frm_style_'. $style->post_name;
+            $class .= ' frm_style_' . $style->post_name;
         }
 
         return $class;
@@ -421,14 +421,14 @@ 
      * @param string $val
      */
 	public static function get_style_val( $val, $form = 'default' ) {
-        $style = self::get_form_style($form);
-        if ( $style && isset( $style->post_content[ $val ] ) ) {
-            return $style->post_content[ $val ];
+        $style = self::get_form_style( $form );
+        if ( $style && isset( $style->post_content[$val] ) ) {
+            return $style->post_content[$val];
         }
     }
 
 	public static function show_entry_styles( $default_styles ) {
-        $frm_style = new FrmStyle('default');
+        $frm_style = new FrmStyle( 'default' );
         $style = $frm_style->get_one();
 
         if ( ! $style ) {
@@ -442,15 +442,15 @@ 
             } else if ( 'alt_bg_color' == $name ) {
                 $setting = 'bg_color_active';
             }
-            $default_styles[ $name ] = $style->post_content[ $setting ];
-            unset($name, $val);
+            $default_styles[$name] = $style->post_content[$setting];
+            unset( $name, $val );
         }
 
         return $default_styles;
     }
 
 	public static function &important_style( $important, $field ) {
-        $important = self::get_style_val('important_style', $field['form_id']);
+        $important = self::get_style_val( 'important_style', $field['form_id'] );
         return $important;
     }
 
@@ -476,18 +476,18 @@ 
     	$i = 0;
     	$first_open = false;
     	do {
-			if ( ! isset( $wp_meta_boxes ) || ! isset( $wp_meta_boxes[ $page ] ) || ! isset( $wp_meta_boxes[ $page ][ $context ] ) ) {
+			if ( ! isset( $wp_meta_boxes ) || ! isset( $wp_meta_boxes[$page] ) || ! isset( $wp_meta_boxes[$page][$context] ) ) {
 				break;
 			}
 
     		foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) {
-    			if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ] ) ) {
-    				foreach ( $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
+    			if ( isset( $wp_meta_boxes[$page][$context][$priority] ) ) {
+    				foreach ( $wp_meta_boxes[$page][$context][$priority] as $box ) {
     					if ( false == $box || ! $box['title'] ) {
     						continue;
 						}
 
-    					$i++;
+    					$i ++;
     					$hidden_class = in_array( $box['id'], $hidden ) ? 'hide-if-js' : '';
 
     					if ( ! $first_open && empty( $hidden_class ) ) {

Indentation +320 added lines, -320 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 
 class FrmStylesController {
-    public static $post_type = 'frm_styles';
-    public static $screen = 'formidable_page_formidable-styles';
-
-    public static function load_pro_hooks() {
-        if ( FrmAppHelper::pro_is_installed() ) {
-            FrmProStylesController::load_pro_hooks();
-        }
-    }
-
-    public static function register_post_types() {
-        register_post_type( self::$post_type, array(
-            'label' => __( 'Styles', 'formidable' ),
-            'public' => false,
-            'show_ui' => false,
-            'capability_type' => 'page',
+	public static $post_type = 'frm_styles';
+	public static $screen = 'formidable_page_formidable-styles';
+
+	public static function load_pro_hooks() {
+		if ( FrmAppHelper::pro_is_installed() ) {
+			FrmProStylesController::load_pro_hooks();
+		}
+	}
+
+	public static function register_post_types() {
+		register_post_type( self::$post_type, array(
+			'label' => __( 'Styles', 'formidable' ),
+			'public' => false,
+			'show_ui' => false,
+			'capability_type' => 'page',
 			'capabilities' => array(
 				'edit_post'		=> 'frm_change_settings',
 				'edit_posts'	=> 'frm_change_settings',
@@ -25,11 +25,11 @@ 
 				'delete_posts'	=> 'frm_change_settings',
 				'read_private_posts' => 'read_private_posts',
 			),
-            'supports' => array(
+			'supports' => array(
 				'title',
-            ),
-            'has_archive' => false,
-            'labels' => array(
+			),
+			'has_archive' => false,
+			'labels' => array(
 				'name' => __( 'Styles', 'formidable' ),
 				'singular_name' => __( 'Style', 'formidable' ),
 				'menu_name' => __( 'Style', 'formidable' ),
@@ -37,31 +37,31 @@ 
 				'add_new_item' => __( 'Create a New Style', 'formidable' ),
 				'edit_item'    => __( 'Edit Style', 'formidable' ),
 			),
-        ) );
-    }
+		) );
+	}
 
-    public static function menu() {
-        add_submenu_page('formidable', 'Formidable | '. __( 'Styles', 'formidable' ), __( 'Styles', 'formidable' ), 'frm_change_settings', 'formidable-styles', 'FrmStylesController::route');
-    }
+	public static function menu() {
+		add_submenu_page('formidable', 'Formidable | '. __( 'Styles', 'formidable' ), __( 'Styles', 'formidable' ), 'frm_change_settings', 'formidable-styles', 'FrmStylesController::route');
+	}
 
-    public static function admin_init() {
-        if ( ! FrmAppHelper::is_admin_page('formidable-styles') ) {
-            return;
-        }
+	public static function admin_init() {
+		if ( ! FrmAppHelper::is_admin_page('formidable-styles') ) {
+			return;
+		}
 
-        self::load_pro_hooks();
-        wp_enqueue_script('jquery-ui-datepicker');
+		self::load_pro_hooks();
+		wp_enqueue_script('jquery-ui-datepicker');
 
-        $version = FrmAppHelper::plugin_version();
+		$version = FrmAppHelper::plugin_version();
 		wp_enqueue_script( 'jquery-frm-themepicker', FrmAppHelper::plugin_url() . '/js/jquery/jquery-ui-themepicker.js', array( 'jquery' ), $version );
 
-        wp_enqueue_style('frm-custom-theme', admin_url('admin-ajax.php') .'?action=frmpro_css');
+		wp_enqueue_style('frm-custom-theme', admin_url('admin-ajax.php') .'?action=frmpro_css');
 
-        $style = apply_filters('frm_style_head', false);
-        if ( $style ) {
-            wp_enqueue_style('frm-single-custom-theme', admin_url('admin-ajax.php') .'?action=frmpro_load_css&flat=1&'. http_build_query($style->post_content));
-        }
-    }
+		$style = apply_filters('frm_style_head', false);
+		if ( $style ) {
+			wp_enqueue_style('frm-single-custom-theme', admin_url('admin-ajax.php') .'?action=frmpro_load_css&flat=1&'. http_build_query($style->post_content));
+		}
+	}
 
 	public static function enqueue_css( $register = 'enqueue' ) {
 		global $frm_vars;
@@ -128,227 +128,227 @@ 
 	}
 
 	public static function new_style( $return = '' ) {
-        self::load_styler('default');
-    }
+		self::load_styler('default');
+	}
 
 	public static function duplicate() {
 		self::load_styler('default');
 	}
 
 	public static function edit( $style_id = false, $message = '' ) {
-        if ( ! $style_id ) {
+		if ( ! $style_id ) {
 			$style_id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
-            if ( empty($style_id) ) {
-                $style_id = 'default';
-            }
-        }
-
-        if ( 'default' == $style_id ) {
-            $style = 'default';
-        } else {
-            $frm_style = new FrmStyle($style_id);
-            $style = $frm_style->get_one();
-            $style = $style->ID;
-        }
-
-        self::load_styler($style, $message);
-    }
-
-    public static function save() {
-        $frm_style = new FrmStyle();
-        $message = '';
+			if ( empty($style_id) ) {
+				$style_id = 'default';
+			}
+		}
+
+		if ( 'default' == $style_id ) {
+			$style = 'default';
+		} else {
+			$frm_style = new FrmStyle($style_id);
+			$style = $frm_style->get_one();
+			$style = $style->ID;
+		}
+
+		self::load_styler($style, $message);
+	}
+
+	public static function save() {
+		$frm_style = new FrmStyle();
+		$message = '';
 		$post_id = FrmAppHelper::get_post_param( 'ID', false, 'sanitize_title' );
 		$style_nonce = FrmAppHelper::get_post_param( 'frm_style', '', 'sanitize_text_field' );
 
 		if ( $post_id !== false && wp_verify_nonce( $style_nonce, 'frm_style_nonce' ) ) {
-            $id = $frm_style->update($post_id);
-            if ( empty($post_id) && ! empty($id) ) {
-                // set the post id to the new style so it will be loaded for editing
-                $post_id = reset($id);
-            }
-            // include the CSS that includes this style
+			$id = $frm_style->update($post_id);
+			if ( empty($post_id) && ! empty($id) ) {
+				// set the post id to the new style so it will be loaded for editing
+				$post_id = reset($id);
+			}
+			// include the CSS that includes this style
 			echo '<link href="' . esc_url( admin_url( 'admin-ajax.php' ) . '?action=frmpro_css' ) . '" type="text/css" rel="Stylesheet" class="frm-custom-theme" />';
-            $message = __( 'Your styling settings have been saved.', 'formidable' );
-        }
+			$message = __( 'Your styling settings have been saved.', 'formidable' );
+		}
 
-        return self::edit($post_id, $message);
-    }
+		return self::edit($post_id, $message);
+	}
 
 	public static function load_styler( $style, $message = '' ) {
-        global $frm_settings;
+		global $frm_settings;
 
-        $frm_style = new FrmStyle();
-        $styles = $frm_style->get_all();
+		$frm_style = new FrmStyle();
+		$styles = $frm_style->get_all();
 
-        if ( is_numeric($style) ) {
-            $style = $styles[ $style ];
-        } else if ( 'default' == $style ) {
-            $style = $frm_style->get_default_style($styles);
-        }
+		if ( is_numeric($style) ) {
+			$style = $styles[ $style ];
+		} else if ( 'default' == $style ) {
+			$style = $frm_style->get_default_style($styles);
+		}
 
-        self::add_meta_boxes();
+		self::add_meta_boxes();
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/styles/show.php');
-    }
+		include(FrmAppHelper::plugin_path() .'/classes/views/styles/show.php');
+	}
 
 	/**
 	 * @param string $message
 	 * @param array|object $forms
 	 */
 	private static function manage( $message = '', $forms = array() ) {
-        $frm_style = new FrmStyle();
-        $styles = $frm_style->get_all();
-        $default_style = $frm_style->get_default_style($styles);
+		$frm_style = new FrmStyle();
+		$styles = $frm_style->get_all();
+		$default_style = $frm_style->get_default_style($styles);
 
-        if ( empty($forms) ) {
-            $forms = FrmForm::get_published_forms();
-        }
+		if ( empty($forms) ) {
+			$forms = FrmForm::get_published_forms();
+		}
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/styles/manage.php');
-    }
+		include(FrmAppHelper::plugin_path() .'/classes/views/styles/manage.php');
+	}
 
-    private static function manage_styles() {
+	private static function manage_styles() {
 		$style_nonce = FrmAppHelper::get_post_param( 'frm_manage_style', '', 'sanitize_text_field' );
 		if ( ! $_POST || ! isset( $_POST['style'] ) || ! wp_verify_nonce( $style_nonce, 'frm_manage_style_nonce' ) ) {
-            return self::manage();
-        }
+			return self::manage();
+		}
 
-        global $wpdb;
+		global $wpdb;
 
 		$forms = FrmForm::get_published_forms();
-        foreach ( $forms as $form ) {
-            if ( $_POST['style'][ $form->id ] == $_POST['prev_style'][ $form->id ] ) {
-                continue;
-            }
+		foreach ( $forms as $form ) {
+			if ( $_POST['style'][ $form->id ] == $_POST['prev_style'][ $form->id ] ) {
+				continue;
+			}
 
-            $form->options['custom_style'] = $_POST['style'][ $form->id ];
+			$form->options['custom_style'] = $_POST['style'][ $form->id ];
 
 			$wpdb->update( $wpdb->prefix . 'frm_forms', array( 'options' => maybe_serialize( $form->options ) ), array( 'id' => $form->id ) );
-            unset($form);
-        }
+			unset($form);
+		}
 
-        $message = __( 'Your form styles have been saved.', 'formidable' );
-        return self::manage($message, $forms);
-    }
+		$message = __( 'Your form styles have been saved.', 'formidable' );
+		return self::manage($message, $forms);
+	}
 
-    public static function custom_css( $message = '', $style = null ) {
-        wp_enqueue_style('codemirror', FrmAppHelper::plugin_url() . '/css/codemirror.css');
-        wp_enqueue_script('codemirror', FrmAppHelper::plugin_url() . '/js/codemirror/codemirror.js', array(), '4.7');
-        wp_enqueue_script( 'codemirror-css', FrmAppHelper::plugin_url() . '/js/codemirror/css.js', array( 'codemirror' ), '4.7' );
+	public static function custom_css( $message = '', $style = null ) {
+		wp_enqueue_style('codemirror', FrmAppHelper::plugin_url() . '/css/codemirror.css');
+		wp_enqueue_script('codemirror', FrmAppHelper::plugin_url() . '/js/codemirror/codemirror.js', array(), '4.7');
+		wp_enqueue_script( 'codemirror-css', FrmAppHelper::plugin_url() . '/js/codemirror/css.js', array( 'codemirror' ), '4.7' );
 
-        if ( ! isset($style) ) {
-            $frm_style = new FrmStyle();
-            $style = $frm_style->get_default_style();
-        }
+		if ( ! isset($style) ) {
+			$frm_style = new FrmStyle();
+			$style = $frm_style->get_default_style();
+		}
 
-        include(FrmAppHelper::plugin_path() .'/classes/views/styles/custom_css.php');
-    }
+		include(FrmAppHelper::plugin_path() .'/classes/views/styles/custom_css.php');
+	}
 
-    public static function save_css() {
-        $frm_style = new FrmStyle();
+	public static function save_css() {
+		$frm_style = new FrmStyle();
 
-        $message = '';
+		$message = '';
 		$post_id = FrmAppHelper::get_post_param( 'ID', false, 'sanitize_text_field' );
 		$nonce = FrmAppHelper::get_post_param( 'frm_custom_css', '', 'sanitize_text_field' );
 		if ( wp_verify_nonce( $nonce, 'frm_custom_css_nonce' ) ) {
-            $frm_style->update($post_id);
-            $message = __( 'Your styling settings have been saved.', 'formidable' );
-        }
+			$frm_style->update($post_id);
+			$message = __( 'Your styling settings have been saved.', 'formidable' );
+		}
 
-        return self::custom_css($message);
-    }
+		return self::custom_css($message);
+	}
 
-    public static function route() {
+	public static function route() {
 		$action = FrmAppHelper::get_param( 'frm_action', '', 'get', 'sanitize_title' );
 
-        switch ( $action ) {
-            case 'edit':
-            case 'save':
-            case 'manage':
-            case 'manage_styles':
-            case 'custom_css':
-            case 'save_css':
+		switch ( $action ) {
+			case 'edit':
+			case 'save':
+			case 'manage':
+			case 'manage_styles':
+			case 'custom_css':
+			case 'save_css':
 				return self::$action();
-            default:
-            	do_action( 'frm_style_action_route', $action );
-            	if ( apply_filters( 'frm_style_stop_action_route', false, $action ) ) {
-                	return;
-            	}
-
-                if ( 'new_style' == $action || 'duplicate' == $action ) {
-                    return self::$action();
-                }
-
-                return self::edit();
-        }
-    }
-
-    public static function reset_styling() {
-        check_ajax_referer( 'frm_ajax', 'nonce' );
-
-        $frm_style = new FrmStyle();
-        $defaults = $frm_style->get_defaults();
-
-        echo json_encode( $defaults );
-        wp_die();
-    }
-
-    public static function change_styling() {
-        check_ajax_referer( 'frm_ajax', 'nonce' );
-
-        $frm_style = new FrmStyle();
-        $defaults = $frm_style->get_defaults();
-
-        // remove the # from the colors
-        foreach ( $_GET['frm_style_setting']['post_content'] as $k => $v ) {
-            if ( ! is_array($v) && strpos($v, '#') === 0 ) {
-                $_GET['frm_style_setting']['post_content'][ $k ] = str_replace( '#', '', $v );
-            }
-        }
-
-        echo '<style type="text/css">';
-        include(FrmAppHelper::plugin_path() .'/css/_single_theme.css.php');
-        echo '</style>';
-        wp_die();
-    }
-
-    private static function add_meta_boxes() {
-
-        // setup meta boxes
-        $meta_boxes = array(
-            'general'           => __( 'General', 'formidable' ),
-            'field-labels'      => __( 'Field Labels', 'formidable' ),
-            'field-description' => __( 'Field Description', 'formidable' ),
-            'field-colors'      => __( 'Field Colors', 'formidable' ),
-            'field-sizes'       => __( 'Field Settings', 'formidable' ),
-            'check-box-radio-fields' => __( 'Check Box & Radio Fields', 'formidable' ),
-            'section-fields'    => __( 'Section Fields', 'formidable' ),
-            'date-fields'       => __( 'Date Fields', 'formidable' ),
-            'buttons'           => __( 'Buttons', 'formidable' ),
-            'form-messages'     => __( 'Form Messages', 'formidable' ),
-        );
-
-        foreach ( $meta_boxes as $nicename => $name ) {
-            add_meta_box( $nicename .'-style', $name, 'FrmStylesController::include_style_section', self::$screen, 'side', 'default', $nicename );
-            unset($nicename, $name);
-        }
-    }
+			default:
+				do_action( 'frm_style_action_route', $action );
+				if ( apply_filters( 'frm_style_stop_action_route', false, $action ) ) {
+					return;
+				}
+
+				if ( 'new_style' == $action || 'duplicate' == $action ) {
+					return self::$action();
+				}
+
+				return self::edit();
+		}
+	}
+
+	public static function reset_styling() {
+		check_ajax_referer( 'frm_ajax', 'nonce' );
+
+		$frm_style = new FrmStyle();
+		$defaults = $frm_style->get_defaults();
+
+		echo json_encode( $defaults );
+		wp_die();
+	}
+
+	public static function change_styling() {
+		check_ajax_referer( 'frm_ajax', 'nonce' );
+
+		$frm_style = new FrmStyle();
+		$defaults = $frm_style->get_defaults();
+
+		// remove the # from the colors
+		foreach ( $_GET['frm_style_setting']['post_content'] as $k => $v ) {
+			if ( ! is_array($v) && strpos($v, '#') === 0 ) {
+				$_GET['frm_style_setting']['post_content'][ $k ] = str_replace( '#', '', $v );
+			}
+		}
+
+		echo '<style type="text/css">';
+		include(FrmAppHelper::plugin_path() .'/css/_single_theme.css.php');
+		echo '</style>';
+		wp_die();
+	}
+
+	private static function add_meta_boxes() {
+
+		// setup meta boxes
+		$meta_boxes = array(
+			'general'           => __( 'General', 'formidable' ),
+			'field-labels'      => __( 'Field Labels', 'formidable' ),
+			'field-description' => __( 'Field Description', 'formidable' ),
+			'field-colors'      => __( 'Field Colors', 'formidable' ),
+			'field-sizes'       => __( 'Field Settings', 'formidable' ),
+			'check-box-radio-fields' => __( 'Check Box & Radio Fields', 'formidable' ),
+			'section-fields'    => __( 'Section Fields', 'formidable' ),
+			'date-fields'       => __( 'Date Fields', 'formidable' ),
+			'buttons'           => __( 'Buttons', 'formidable' ),
+			'form-messages'     => __( 'Form Messages', 'formidable' ),
+		);
+
+		foreach ( $meta_boxes as $nicename => $name ) {
+			add_meta_box( $nicename .'-style', $name, 'FrmStylesController::include_style_section', self::$screen, 'side', 'default', $nicename );
+			unset($nicename, $name);
+		}
+	}
 
 	public static function include_style_section( $atts, $sec ) {
-        extract($atts);
+		extract($atts);
 		$current_tab = FrmAppHelper::simple_get( 'page-tab', 'sanitize_title', 'default' );
-        include(FrmAppHelper::plugin_path() .'/classes/views/styles/_'. $sec['args'] .'.php');
-    }
+		include(FrmAppHelper::plugin_path() .'/classes/views/styles/_'. $sec['args'] .'.php');
+	}
 
-    public static function load_css() {
-        header('Content-type: text/css');
+	public static function load_css() {
+		header('Content-type: text/css');
 
-        $frm_style = new FrmStyle();
-        $defaults = $frm_style->get_defaults();
+		$frm_style = new FrmStyle();
+		$defaults = $frm_style->get_defaults();
 
-        include(FrmAppHelper::plugin_path() .'/css/_single_theme.css.php');
-        wp_die();
-    }
+		include(FrmAppHelper::plugin_path() .'/css/_single_theme.css.php');
+		wp_die();
+	}
 
 	public static function load_saved_css() {
 		$css = get_transient( 'frmpro_css' );
@@ -357,142 +357,142 @@ 
 		wp_die();
 	}
 
-    /**
-     * Check if the Formidable styling should be loaded,
-     * then enqueue it for the footer
-     * @since 2.0
-     */
-    public static function enqueue_style() {
-        global $frm_vars;
-
-        if ( isset( $frm_vars['css_loaded'] ) && $frm_vars['css_loaded'] ) {
-            // the CSS has already been loaded
-            return;
-        }
-
-        $frm_settings = FrmAppHelper::get_settings();
-        if ( $frm_settings->load_style != 'none' ) {
-            wp_enqueue_style( 'formidable' );
-            $frm_vars['css_loaded'] = true;
-        }
-    }
-
-    // Get the stylesheets for the form settings page
-    public static function get_style_opts() {
-        $frm_style = new FrmStyle();
-        $styles = $frm_style->get_all();
-
-        return $styles;
-    }
-
-    public static function get_form_style( $form = 'default' ) {
-        $style = FrmFormsHelper::get_form_style( $form );
-
-        if ( empty( $style ) || 1 == $style ) {
-            $style = 'default';
-        }
-
-        $frm_style = new FrmStyle( $style );
-        return $frm_style->get_one();
-    }
-
-    /**
-     * @param string $class
-     * @param string $style
-     */
+	/**
+	 * Check if the Formidable styling should be loaded,
+	 * then enqueue it for the footer
+	 * @since 2.0
+	 */
+	public static function enqueue_style() {
+		global $frm_vars;
+
+		if ( isset( $frm_vars['css_loaded'] ) && $frm_vars['css_loaded'] ) {
+			// the CSS has already been loaded
+			return;
+		}
+
+		$frm_settings = FrmAppHelper::get_settings();
+		if ( $frm_settings->load_style != 'none' ) {
+			wp_enqueue_style( 'formidable' );
+			$frm_vars['css_loaded'] = true;
+		}
+	}
+
+	// Get the stylesheets for the form settings page
+	public static function get_style_opts() {
+		$frm_style = new FrmStyle();
+		$styles = $frm_style->get_all();
+
+		return $styles;
+	}
+
+	public static function get_form_style( $form = 'default' ) {
+		$style = FrmFormsHelper::get_form_style( $form );
+
+		if ( empty( $style ) || 1 == $style ) {
+			$style = 'default';
+		}
+
+		$frm_style = new FrmStyle( $style );
+		return $frm_style->get_one();
+	}
+
+	/**
+	 * @param string $class
+	 * @param string $style
+	 */
 	public static function get_form_style_class( $class, $style ) {
-        if ( 1 == $style ) {
-            $style = 'default';
-        }
+		if ( 1 == $style ) {
+			$style = 'default';
+		}
 
-        $frm_style = new FrmStyle($style);
-        $style = $frm_style->get_one();
+		$frm_style = new FrmStyle($style);
+		$style = $frm_style->get_one();
 
-        if ( $style ) {
-            $class .= ' frm_style_'. $style->post_name;
-        }
+		if ( $style ) {
+			$class .= ' frm_style_'. $style->post_name;
+		}
 
-        return $class;
-    }
+		return $class;
+	}
 
-    /**
-     * @param string $val
-     */
+	/**
+	 * @param string $val
+	 */
 	public static function get_style_val( $val, $form = 'default' ) {
-        $style = self::get_form_style($form);
-        if ( $style && isset( $style->post_content[ $val ] ) ) {
-            return $style->post_content[ $val ];
-        }
-    }
+		$style = self::get_form_style($form);
+		if ( $style && isset( $style->post_content[ $val ] ) ) {
+			return $style->post_content[ $val ];
+		}
+	}
 
 	public static function show_entry_styles( $default_styles ) {
-        $frm_style = new FrmStyle('default');
-        $style = $frm_style->get_one();
-
-        if ( ! $style ) {
-            return $default_styles;
-        }
-
-        foreach ( $default_styles as $name => $val ) {
-            $setting = $name;
-            if ( 'border_width' == $name ) {
-                $setting = 'field_border_width';
-            } else if ( 'alt_bg_color' == $name ) {
-                $setting = 'bg_color_active';
-            }
-            $default_styles[ $name ] = $style->post_content[ $setting ];
-            unset($name, $val);
-        }
-
-        return $default_styles;
-    }
+		$frm_style = new FrmStyle('default');
+		$style = $frm_style->get_one();
+
+		if ( ! $style ) {
+			return $default_styles;
+		}
+
+		foreach ( $default_styles as $name => $val ) {
+			$setting = $name;
+			if ( 'border_width' == $name ) {
+				$setting = 'field_border_width';
+			} else if ( 'alt_bg_color' == $name ) {
+				$setting = 'bg_color_active';
+			}
+			$default_styles[ $name ] = $style->post_content[ $setting ];
+			unset($name, $val);
+		}
+
+		return $default_styles;
+	}
 
 	public static function &important_style( $important, $field ) {
-        $important = self::get_style_val('important_style', $field['form_id']);
-        return $important;
-    }
+		$important = self::get_style_val('important_style', $field['form_id']);
+		return $important;
+	}
 
-    /**
-     * Fallback for WP < 3.6
-     */
-    public static function do_accordion_sections( $screen, $context, $object ) {
-        if ( function_exists( 'do_accordion_sections' ) ) {
-            return do_accordion_sections( $screen, $context, $object );
-        }
+	/**
+	 * Fallback for WP < 3.6
+	 */
+	public static function do_accordion_sections( $screen, $context, $object ) {
+		if ( function_exists( 'do_accordion_sections' ) ) {
+			return do_accordion_sections( $screen, $context, $object );
+		}
 
-    	global $wp_meta_boxes;
+		global $wp_meta_boxes;
 
-        $screen = 'formidable_page_formidable-styles';
-        $screen = convert_to_screen( $screen );
+		$screen = 'formidable_page_formidable-styles';
+		$screen = convert_to_screen( $screen );
 
-    	$page = $screen->id;
+		$page = $screen->id;
 
-    	$hidden = get_hidden_meta_boxes( $screen );
-    	?>
+		$hidden = get_hidden_meta_boxes( $screen );
+		?>
     	<div id="side-sortables" class="accordion-container">
     	<?php
-    	$i = 0;
-    	$first_open = false;
-    	do {
+		$i = 0;
+		$first_open = false;
+		do {
 			if ( ! isset( $wp_meta_boxes ) || ! isset( $wp_meta_boxes[ $page ] ) || ! isset( $wp_meta_boxes[ $page ][ $context ] ) ) {
 				break;
 			}
 
-    		foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) {
-    			if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ] ) ) {
-    				foreach ( $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
-    					if ( false == $box || ! $box['title'] ) {
-    						continue;
+			foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) {
+				if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ] ) ) {
+					foreach ( $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
+						if ( false == $box || ! $box['title'] ) {
+							continue;
 						}
 
-    					$i++;
-    					$hidden_class = in_array( $box['id'], $hidden ) ? 'hide-if-js' : '';
+						$i++;
+						$hidden_class = in_array( $box['id'], $hidden ) ? 'hide-if-js' : '';
 
-    					if ( ! $first_open && empty( $hidden_class ) ) {
-    						$first_open = true;
-    					}
+						if ( ! $first_open && empty( $hidden_class ) ) {
+							$first_open = true;
+						}
 
-    					?>
+						?>
 						<div class="postbox <?php echo esc_attr( $box['id'] ); ?>">
 						<div class="handlediv" title="<?php esc_attr_e( 'Click to toggle', 'formidable' ) ?>"><br/></div>
                         <h3 class='hndle'><span><?php echo esc_html( $box['title'] ); ?></span></h3>
@@ -503,13 +503,13 @@ 
     						</div><!-- .accordion-section-content -->
     					</div><!-- .postbox -->
     					<?php
-    				}
-    			}
-    		}
-    	} while ( 0 );
-    	?>
+					}
+				}
+			}
+		} while ( 0 );
+		?>
     	</div><!-- .accordion-container -->
     	<?php
-    	return $i;
-    }
+		return $i;
+	}
 }

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' );
 	}
 }