Strategy11 / formidable-forms

classes/helpers/FrmAppHelper.php

Doc Comments +15 added lines

@@ -57,6 +57,9 @@ 
         return get_option('blogname');
     }
 
+	/**
+	 * @param string $url
+	 */
 	public static function make_affiliate_url( $url ) {
 		$affiliate_id = self::get_affiliate();
 		if ( ! empty( $affiliate_id ) ) {
@@ -66,6 +69,9 @@ 
 		return $url;
 	}
 
+	/**
+	 * @return string
+	 */
 	public static function get_affiliate() {
 		return absint( apply_filters( 'frm_affiliate_id', 0 ) );
 	}
@@ -769,6 +775,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;
@@ -1202,6 +1211,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];
@@ -1235,6 +1247,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 +904 added lines, -904 removed lines

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

Spacing +177 added lines, -177 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -23,11 +23,11 @@ 
     }
 
     public static function plugin_folder() {
-        return basename(self::plugin_path());
+        return basename( self::plugin_path() );
     }
 
     public static function plugin_path() {
-        return dirname(dirname(dirname(__FILE__)));
+        return dirname( dirname( dirname( __FILE__ ) ) );
     }
 
     public static function plugin_url() {
@@ -54,14 +54,14 @@ 
      * @return string
      */
     public static function site_name() {
-        return get_option('blogname');
+        return get_option( 'blogname' );
     }
 
 	public static function make_affiliate_url( $url ) {
 		$affiliate_id = self::get_affiliate();
 		if ( ! empty( $affiliate_id ) ) {
 			$url = str_replace( array( 'http://', 'https://' ), '', $url );
-			$url = 'http://www.shareasale.com/r.cfm?u='. absint( $affiliate_id ) .'&b=841990&m=64739&afftrack=plugin&urllink=' . urlencode( $url );
+			$url = 'http://www.shareasale.com/r.cfm?u=' . absint( $affiliate_id ) . '&b=841990&m=64739&afftrack=plugin&urllink=' . urlencode( $url );
 		}
 		return $url;
 	}
@@ -80,7 +80,7 @@ 
      */
     public static function get_settings() {
         global $frm_settings;
-        if ( empty($frm_settings) ) {
+        if ( empty( $frm_settings ) ) {
             $frm_settings = new FrmSettings();
         }
         return $frm_settings;
@@ -109,7 +109,7 @@ 
     }
 
     public static function pro_is_installed() {
-        return apply_filters('frm_pro_installed', false);
+        return apply_filters( 'frm_pro_installed', false );
     }
 
     /**
@@ -153,7 +153,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();
     }
 
 	/**
@@ -173,7 +173,7 @@ 
      * @return boolean
      */
     public static function is_admin() {
-        return is_admin() && ( ! defined('DOING_AJAX') || ! DOING_AJAX );
+        return is_admin() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX );
     }
 
     /**
@@ -200,7 +200,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] ) : '';
     }
 
     /**
@@ -215,14 +215,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;
                 }
             }
@@ -232,15 +232,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( $_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( $_GET[$param] ) );
             }
 			self::sanitize_value( $sanitize, $value );
 		} else {
@@ -249,12 +249,12 @@ 
 
 		if ( isset( $params ) && is_array( $value ) && ! empty( $value ) ) {
             foreach ( $params as $k => $p ) {
-                if ( ! $k || ! is_array($value) ) {
+                if ( ! $k || ! is_array( $value ) ) {
                     continue;
                 }
 
-                $p = trim($p, ']');
-                $value = isset( $value[ $p ] ) ? $value[ $p ] : $default;
+                $p = trim( $p, ']' );
+                $value = isset( $value[$p] ) ? $value[$p] : $default;
             }
         }
 
@@ -293,16 +293,16 @@ 
 
 		$value = $args['default'];
 		if ( $args['type'] == 'get' ) {
-			if ( $_GET && isset( $_GET[ $args['param'] ] ) ) {
-				$value = $_GET[ $args['param'] ];
+			if ( $_GET && isset( $_GET[$args['param']] ) ) {
+				$value = $_GET[$args['param']];
 			}
 		} else if ( $args['type'] == 'post' ) {
-			if ( isset( $_POST[ $args['param'] ] ) ) {
-				$value = stripslashes_deep( maybe_unserialize( $_POST[ $args['param'] ] ) );
+			if ( isset( $_POST[$args['param']] ) ) {
+				$value = stripslashes_deep( maybe_unserialize( $_POST[$args['param']] ) );
 			}
 		} else {
-			if ( isset( $_REQUEST[ $args['param'] ] ) ) {
-				$value = $_REQUEST[ $args['param'] ];
+			if ( isset( $_REQUEST[$args['param']] ) ) {
+				$value = $_REQUEST[$args['param']];
 			}
 		}
 
@@ -330,7 +330,7 @@ 
 			if ( is_array( $value ) ) {
 				$temp_values = $value;
 				foreach ( $temp_values as $k => $v ) {
-					FrmAppHelper::sanitize_value( $sanitize, $value[ $k ] );
+					FrmAppHelper::sanitize_value( $sanitize, $value[$k] );
 				}
 			} else {
 				$value = call_user_func( $sanitize, $value );
@@ -341,8 +341,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 );
             }
         }
     }
@@ -350,7 +350,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 );
 		}
 	}
 
@@ -377,7 +377,7 @@ 
 			$allowed_html = $html;
 		} else {
 			foreach ( $allowed as $a ) {
-				$allowed_html[ $a ] = isset( $html[ $a ] ) ? $html[ $a ] : array();
+				$allowed_html[$a] = isset( $html[$a] ) ? $html[$a] : array();
 			}
 		}
 
@@ -474,7 +474,7 @@ 
      * @since 2.0
      */
     public static function remove_get_action() {
-        if ( ! isset($_GET) ) {
+        if ( ! isset( $_GET ) ) {
             return;
         }
 
@@ -496,8 +496,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;
@@ -536,17 +536,17 @@ 
     }
 
     public static function get_pages() {
-		return get_posts( array( 'post_type' => 'page', 'post_status' => array( 'publish', 'private' ), 'numberposts' => -1, 'orderby' => 'title', 'order' => 'ASC' ) );
+		return get_posts( array( 'post_type' => 'page', 'post_status' => array( 'publish', 'private' ), 'numberposts' => - 1, 'orderby' => 'title', 'order' => 'ASC' ) );
     }
 
     public static function wp_pages_dropdown( $field_name, $page_id, $truncate = false ) {
         $pages = self::get_pages();
 		$selected = self::get_post_param( $field_name, $page_id, 'absint' );
     ?>
-        <select name="<?php echo esc_attr($field_name); ?>" id="<?php echo esc_attr($field_name); ?>" class="frm-pages-dropdown">
+        <select name="<?php echo esc_attr( $field_name ); ?>" id="<?php echo esc_attr( $field_name ); ?>" class="frm-pages-dropdown">
             <option value=""> </option>
             <?php foreach ( $pages as $page ) { ?>
-				<option value="<?php echo esc_attr($page->ID); ?>" <?php selected( $selected, $page->ID ) ?>>
+				<option value="<?php echo esc_attr( $page->ID ); ?>" <?php selected( $selected, $page->ID ) ?>>
 					<?php echo esc_html( $truncate ? self::truncate( $page->post_title, $truncate ) : $page->post_title ); ?>
 				</option>
             <?php } ?>
@@ -555,7 +555,7 @@ 
     }
 
 	public static function post_edit_link( $post_id ) {
-        $post = get_post($post_id);
+        $post = get_post( $post_id );
         if ( $post ) {
 			$post_url = admin_url( 'post.php?post=' . $post_id . '&action=edit' );
 			return '<a href="' . esc_url( $post_url ) . '">' . self::truncate( $post->post_title, 50 ) . '</a>';
@@ -565,17 +565,17 @@ 
 
 	public static function wp_roles_dropdown( $field_name, $capability, $multiple = 'single' ) {
     ?>
-        <select name="<?php echo esc_attr($field_name); ?>" id="<?php echo esc_attr($field_name); ?>" <?php
+        <select name="<?php echo esc_attr( $field_name ); ?>" id="<?php echo esc_attr( $field_name ); ?>" <?php
             echo ( 'multiple' == $multiple ) ? 'multiple="multiple"' : '';
             ?> class="frm_multiselect">
-            <?php self::roles_options($capability); ?>
+            <?php self::roles_options( $capability ); ?>
         </select>
     <?php
     }
 
 	public static function roles_options( $capability ) {
         global $frm_vars;
-        if ( isset($frm_vars['editable_roles']) ) {
+        if ( isset( $frm_vars['editable_roles'] ) ) {
             $editable_roles = $frm_vars['editable_roles'];
         } else {
             $editable_roles = get_editable_roles();
@@ -583,10 +583,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 );
         }
     }
 
@@ -642,7 +642,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;
         }
 
@@ -651,7 +651,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 );
         }
     }
 
@@ -676,12 +676,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 );
         }
     }
 
@@ -698,11 +698,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;
         }
@@ -782,7 +782,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 );
 					}
 				}
 			}
@@ -803,11 +803,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;
 				}
@@ -830,8 +830,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;
     }
@@ -850,7 +850,7 @@ 
      */
     public static function jquery_ui_base_url() {
 		$url = 'http' . ( is_ssl() ? 's' : '' ) . '://ajax.googleapis.com/ajax/libs/jqueryui/' . self::script_version( 'jquery-ui-core', '1.11.4' );
-        $url = apply_filters('frm_jquery_ui_base_url', $url);
+        $url = apply_filters( 'frm_jquery_ui_base_url', $url );
         return $url;
     }
 
@@ -864,11 +864,11 @@ 
 		}
 
 		$ver = $default;
-		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 ) && ! empty( $query->ver ) ) {
 			$ver = $query->ver;
 		}
@@ -881,7 +881,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;
         }
 
@@ -889,29 +889,29 @@ 
 		if ( $user_id == 'current' ) {
 			$user_id = get_current_user_id();
 		} else {
-            if ( is_email($user_id) ) {
-                $user = get_user_by('email', $user_id);
+            if ( is_email( $user_id ) ) {
+                $user = get_user_by( 'email', $user_id );
             } else {
-                $user = get_user_by('login', $user_id);
+                $user = get_user_by( 'login', $user_id );
             }
 
             if ( $user ) {
                 $user_id = $user->ID;
             }
-            unset($user);
+            unset( $user );
         }
 
         return $user_id;
     }
 
 	public static function get_file_contents( $filename, $atts = array() ) {
-        if ( ! is_file($filename) ) {
+        if ( ! is_file( $filename ) ) {
             return false;
         }
 
-        extract($atts);
+        extract( $atts );
         ob_start();
-        include($filename);
+        include( $filename );
         $contents = ob_get_contents();
         ob_end_clean();
         return $contents;
@@ -927,27 +927,27 @@ 
         $key = '';
 
         if ( ! empty( $name ) ) {
-            $key = sanitize_key($name);
+            $key = sanitize_key( $name );
         }
 
 		if ( empty( $key ) ) {
-            $max_slug_value = pow(36, $num_chars);
+            $max_slug_value = pow( 36, $num_chars );
             $min_slug_value = 37; // we want to have at least 2 characters in the slug
-            $key = base_convert( rand($min_slug_value, $max_slug_value), 10, 36 );
+            $key = base_convert( rand( $min_slug_value, $max_slug_value ), 10, 36 );
         }
 
-		if ( is_numeric($key) || in_array( $key, array( 'id', 'key', 'created-at', 'detaillink', 'editlink', 'siteurl', 'evenodd' ) ) ) {
+		if ( is_numeric( $key ) || in_array( $key, array( 'id', 'key', 'created-at', 'detaillink', 'editlink', 'siteurl', 'evenodd' ) ) ) {
 			$key = $key . 'a';
         }
 
 		$key_check = FrmDb::get_var( $table_name, array( $column => $key, 'ID !' => $id ), $column );
 
-        if ( $key_check || is_numeric($key_check) ) {
+        if ( $key_check || is_numeric( $key_check ) ) {
             $suffix = 2;
 			do {
 				$alt_post_name = substr( $key, 0, 200 - ( strlen( $suffix ) + 1 ) ) . $suffix;
 				$key_check = FrmDb::get_var( $table_name, array( $column => $alt_post_name, 'ID !' => $id ), $column );
-				$suffix++;
+				$suffix ++;
 			} while ( $key_check || is_numeric( $key_check ) );
 			$key = $alt_post_name;
         }
@@ -964,32 +964,32 @@ 
             return false;
         }
 
-        if ( empty($post_values) ) {
-            $post_values = stripslashes_deep($_POST);
+        if ( empty( $post_values ) ) {
+            $post_values = stripslashes_deep( $_POST );
         }
 
 		$values = array( 'id' => $record->id, 'fields' => array() );
 
 		foreach ( array( 'name', 'description' ) as $var ) {
-            $default_val = isset($record->{$var}) ? $record->{$var} : '';
-			$values[ $var ] = self::get_param( $var, $default_val, 'get', 'wp_kses_post' );
-            unset($var, $default_val);
+            $default_val = isset( $record->{$var}) ? $record->{$var} : '';
+			$values[$var] = self::get_param( $var, $default_val, 'get', 'wp_kses_post' );
+            unset( $var, $default_val );
         }
 
-        $values['description'] = self::use_wpautop($values['description']);
+        $values['description'] = self::use_wpautop( $values['description'] );
         $frm_settings = self::get_settings();
-        $is_form_builder = self::is_admin_page('formidable' );
+        $is_form_builder = self::is_admin_page( 'formidable' );
 
         foreach ( (array) $fields as $field ) {
             // Make sure to filter default values (for placeholder text), but not on the form builder page
             if ( ! $is_form_builder ) {
-                $field->default_value = apply_filters('frm_get_default_value', $field->default_value, $field, true );
+                $field->default_value = apply_filters( 'frm_get_default_value', $field->default_value, $field, true );
             }
 			$parent_form_id = isset( $args['parent_form_id'] ) ? $args['parent_form_id'] : $field->form_id;
-			self::fill_field_defaults($field, $record, $values, compact('default', 'post_values', 'frm_settings', 'parent_form_id' ) );
+			self::fill_field_defaults( $field, $record, $values, compact( 'default', 'post_values', 'frm_settings', 'parent_form_id' ) );
         }
 
-        self::fill_form_opts($record, $table, $post_values, $values);
+        self::fill_form_opts( $record, $table, $post_values, $values );
 
         if ( $table == 'entries' ) {
             $values = FrmEntriesHelper::setup_edit_vars( $values, $record );
@@ -1006,8 +1006,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 ) );
@@ -1016,8 +1016,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,
@@ -1025,7 +1025,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,
@@ -1035,40 +1035,40 @@ 
         );
 
         $args['field_type'] = $field_type;
-        self::fill_field_opts($field, $field_array, $args);
+        self::fill_field_opts( $field, $field_array, $args );
 		// Track the original field's type
 		$field_array['original_type'] = isset( $field->field_options['original_type'] ) ? $field->field_options['original_type'] : $field->type;
 
         $field_array = apply_filters( 'frm_setup_edit_fields_vars', $field_array, $field, $values['id'], array() );
 
-        if ( ! isset($field_array['unique']) || ! $field_array['unique'] ) {
+        if ( ! isset( $field_array['unique'] ) || ! $field_array['unique'] ) {
             $field_array['unique_msg'] = '';
         }
 
         $field_array = array_merge( $field->field_options, $field_array );
 
-        $values['fields'][ $field->id ] = $field_array;
+        $values['fields'][$field->id] = $field_array;
     }
 
 	private static function fill_field_opts( $field, array &$field_array, $args ) {
         $post_values = $args['post_values'];
-        $opt_defaults = FrmFieldsHelper::get_default_field_opts($field_array['type'], $field, true);
+        $opt_defaults = FrmFieldsHelper::get_default_field_opts( $field_array['type'], $field, true );
 
         foreach ( $opt_defaults as $opt => $default_opt ) {
-			$field_array[ $opt ] = ( $post_values && isset( $post_values['field_options'][ $opt . '_' . $field->id ] ) ) ? maybe_unserialize( $post_values['field_options'][ $opt . '_' . $field->id ] ) : ( isset( $field->field_options[ $opt ] ) ? $field->field_options[ $opt ] : $default_opt );
-            if ( $opt == 'blank' && $field_array[ $opt ] == '' ) {
-                $field_array[ $opt ] = $args['frm_settings']->blank_msg;
-            } else if ( $opt == 'invalid' && $field_array[ $opt ] == '' ) {
+			$field_array[$opt] = ( $post_values && isset( $post_values['field_options'][$opt . '_' . $field->id] ) ) ? maybe_unserialize( $post_values['field_options'][$opt . '_' . $field->id] ) : ( isset( $field->field_options[$opt] ) ? $field->field_options[$opt] : $default_opt );
+            if ( $opt == 'blank' && $field_array[$opt] == '' ) {
+                $field_array[$opt] = $args['frm_settings']->blank_msg;
+            } else if ( $opt == 'invalid' && $field_array[$opt] == '' ) {
                 if ( $args['field_type'] == 'captcha' ) {
-                    $field_array[ $opt ] = $args['frm_settings']->re_msg;
+                    $field_array[$opt] = $args['frm_settings']->re_msg;
                 } else {
-                    $field_array[ $opt ] = sprintf( __( '%s is invalid', 'formidable' ), $field_array['name'] );
+                    $field_array[$opt] = sprintf( __( '%s is invalid', 'formidable' ), $field_array['name'] );
                 }
             }
         }
 
         if ( $field_array['custom_html'] == '' ) {
-            $field_array['custom_html'] = FrmFieldsHelper::get_default_html($args['field_type']);
+            $field_array['custom_html'] = FrmFieldsHelper::get_default_html( $args['field_type'] );
         }
     }
 
@@ -1087,18 +1087,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 );
     }
 
     /**
@@ -1108,11 +1108,11 @@ 
         $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'] ) ) {
@@ -1120,10 +1120,10 @@ 
 		}
 
 		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 );
         }
     }
 
@@ -1154,9 +1154,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
     }
@@ -1174,7 +1174,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 = '';
@@ -1183,23 +1183,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 ) {
@@ -1212,17 +1212,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 );
@@ -1237,7 +1237,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 );
@@ -1283,10 +1283,10 @@ 
 		$time_strings = self::get_time_strings();
 
 		foreach ( $time_strings as $k => $v ) {
-			if ( $diff[ $k ] ) {
-				$time_strings[ $k ] = $diff[ $k ] . ' ' . ( $diff[ $k ] > 1 ? $v[1] : $v[0] );
+			if ( $diff[$k] ) {
+				$time_strings[$k] = $diff[$k] . ' ' . ( $diff[$k] > 1 ? $v[1] : $v[0] );
 			} else {
-				unset( $time_strings[ $k ] );
+				unset( $time_strings[$k] );
 			}
 		}
 
@@ -1341,19 +1341,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;
                 }
 
@@ -1367,24 +1367,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;
@@ -1397,8 +1397,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;
         }
     }
 
@@ -1413,7 +1413,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;
         }
 
@@ -1423,7 +1423,7 @@ 
             echo ' class="frm_help"';
         }
 
-		echo ' title="' . esc_attr( $tooltips[ $name ] );
+		echo ' title="' . esc_attr( $tooltips[$name] );
 
         if ( 'open' != $class ) {
             echo '"';
@@ -1475,13 +1475,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 {
@@ -1489,22 +1489,22 @@ 
 			$val = stripslashes( $val );
 
 			// Add backslashes before double quotes and forward slashes only
-			$post_content[ $key ] = addcslashes( $val, '"\\/' );
+			$post_content[$key] = addcslashes( $val, '"\\/' );
 		}
 	}
 
 	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;
         }
@@ -1520,11 +1520,11 @@ 
 	public static function maybe_highlight_menu( $post_type ) {
         global $post;
 
-        if ( isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != $post_type ) {
+        if ( isset( $_REQUEST['post_type'] ) && $_REQUEST['post_type'] != $post_type ) {
             return;
         }
 
-        if ( is_object($post) && $post->post_type != $post_type ) {
+        if ( is_object( $post ) && $post->post_type != $post_type ) {
             return;
         }
 
@@ -1628,11 +1628,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>';
@@ -1640,38 +1640,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' ) {
@@ -1690,8 +1690,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/helpers/FrmEntriesListHelper.php

Indentation +44 added lines, -44 removed lines

@@ -6,10 +6,10 @@ 
 	protected $field;
 
 	public function prepare_items() {
-        global $per_page;
+		global $per_page;
 
 		$per_page = $this->get_items_per_page( 'formidable_page_formidable_entries_per_page' );
-        $form_id = $this->params['form'];
+		$form_id = $this->params['form'];
 
 		$default_orderby = 'id';
 		$default_order = 'DESC';
@@ -25,28 +25,28 @@ 
 
 		$s = isset( $_REQUEST['s'] ) ? stripslashes($_REQUEST['s']) : '';
 
-	    if ( $s != '' && FrmAppHelper::pro_is_installed() ) {
-	        $fid = isset( $_REQUEST['fid'] ) ? sanitize_title( $_REQUEST['fid'] ) : '';
-	        $s_query = FrmProEntriesHelper::get_search_str( $s_query, $s, $form_id, $fid );
-	    }
+		if ( $s != '' && FrmAppHelper::pro_is_installed() ) {
+			$fid = isset( $_REQUEST['fid'] ) ? sanitize_title( $_REQUEST['fid'] ) : '';
+			$s_query = FrmProEntriesHelper::get_search_str( $s_query, $s, $form_id, $fid );
+		}
 
 		$s_query = apply_filters( 'frm_entries_list_query', $s_query, compact( 'form_id' ) );
 
-        $orderby = isset( $_REQUEST['orderby'] ) ? sanitize_title( $_REQUEST['orderby'] ) : $default_orderby;
-        if ( strpos($orderby, 'meta') !== false ) {
-            $order_field_type = FrmField::get_type( str_replace( 'meta_', '', $orderby ) );
+		$orderby = isset( $_REQUEST['orderby'] ) ? sanitize_title( $_REQUEST['orderby'] ) : $default_orderby;
+		if ( strpos($orderby, 'meta') !== false ) {
+			$order_field_type = FrmField::get_type( str_replace( 'meta_', '', $orderby ) );
 			$orderby .= in_array( $order_field_type, array( 'number', 'scale' ) ) ? ' +0 ' : '';
-        }
+		}
 
 		$order = isset( $_REQUEST['order'] ) ? sanitize_title( $_REQUEST['order'] ) : $default_order;
 		$order = ' ORDER BY ' . $orderby . ' ' . $order;
 
-        $page = $this->get_pagenum();
+		$page = $this->get_pagenum();
 		$start = (int) isset( $_REQUEST['start'] ) ? absint( $_REQUEST['start'] ) : ( ( $page - 1 ) * $per_page );
 
 		$limit = FrmDb::esc_limit( $start . ',' . $per_page );
 		$this->items = FrmEntry::getAll( $s_query, $order, $limit, true, $join_form_in_query );
-        $total_items = FrmEntry::getRecordCount($s_query);
+		$total_items = FrmEntry::getRecordCount($s_query);
 
 		$this->set_pagination_args( array(
 			'total_items' => $total_items,
@@ -55,19 +55,19 @@ 
 	}
 
 	public function no_items() {
-        $s = isset( $_REQUEST['s'] ) ? $_REQUEST['s'] : '';
-	    if ( ! empty($s) ) {
-            _e( 'No Entries Found', 'formidable' );
-            return;
-        }
+		$s = isset( $_REQUEST['s'] ) ? $_REQUEST['s'] : '';
+		if ( ! empty($s) ) {
+			_e( 'No Entries Found', 'formidable' );
+			return;
+		}
 
 		$form_id = $this->params['form'];
 		$form = $this->params['form'];
 
-        if ( $form_id ) {
-            $form = FrmForm::getOne($form_id);
-        }
-        $colspan = $this->get_column_count();
+		if ( $form_id ) {
+			$form = FrmForm::getOne($form_id);
+		}
+		$colspan = $this->get_column_count();
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/no_entries.php' );
 	}
@@ -87,12 +87,12 @@ 
 	}
 
 	/**
-	* Gets the name of the primary column in the Entries screen
-	*
-	* @since 2.0.14
-	*
-	* @return string $primary_column
-	*/
+	 * Gets the name of the primary column in the Entries screen
+	 *
+	 * @since 2.0.14
+	 *
+	 * @return string $primary_column
+	 */
 	protected function get_primary_column_name() {
 		$columns = get_column_headers( $this->screen );
 		$hidden = get_hidden_columns( $this->screen );
@@ -116,7 +116,7 @@ 
 
 		$this->get_actions( $actions, $item, $view_link );
 
-        $action_links = $this->row_actions( $actions );
+		$action_links = $this->row_actions( $actions );
 
 		// Set up the checkbox ( because the user is editable, otherwise its empty )
 		$checkbox = "<input type='checkbox' name='item-action[]' id='cb-item-action-{$item->id}' value='{$item->id}' />";
@@ -124,7 +124,7 @@ 
 		$r = "<tr id='item-action-{$item->id}'$style>";
 
 		list( $columns, $hidden, , $primary ) = $this->get_column_info();
-        $action_col = false;
+		$action_col = false;
 
 		foreach ( $columns as $column_name => $column_display_name ) {
 			$class = $column_name . ' column-' . $column_name;
@@ -136,8 +136,8 @@ 
 			if ( in_array( $column_name, $hidden ) ) {
 				$class .= ' frm_hidden';
 			} else if ( ! $action_col && ! in_array( $column_name, array( 'cb', 'id', 'form_id', 'post_id' ) ) ) {
-			    $action_col = $column_name;
-            }
+				$action_col = $column_name;
+			}
 
 			$attributes = 'class="' . esc_attr( $class ) . '"';
 			unset($class);
@@ -155,15 +155,15 @@ 
 					$val = $this->column_value( $item );
 				}
 
-			    $r .= "<td $attributes>";
+				$r .= "<td $attributes>";
 				if ( $column_name == $action_col ) {
 					$edit_link = '?page=formidable-entries&frm_action=edit&id=' . $item->id;
 					$r .= '<a href="' . esc_url( isset( $actions['edit'] ) ? $edit_link : $view_link ) . '" class="row-title" >' . $val . '</a> ';
-			        $r .= $action_links;
+					$r .= $action_links;
 				} else {
-			        $r .= $val;
-			    }
-			    $r .= '</td>';
+					$r .= $val;
+				}
+				$r .= '</td>';
 			}
 			unset($val);
 		}
@@ -216,19 +216,19 @@ 
 		return $val;
 	}
 
-    /**
-     * @param string $view_link
-     */
-    private function get_actions( &$actions, $item, $view_link ) {
+	/**
+	 * @param string $view_link
+	 */
+	private function get_actions( &$actions, $item, $view_link ) {
 		$actions['view'] = '<a href="' . esc_url( $view_link ) . '">' . __( 'View', 'formidable' ) . '</a>';
 
-        if ( current_user_can('frm_delete_entries') ) {
+		if ( current_user_can('frm_delete_entries') ) {
 			$delete_link = '?page=formidable-entries&frm_action=destroy&id=' . $item->id . '&form=' . $this->params['form'];
 			$actions['delete'] = '<a href="' . esc_url( wp_nonce_url( $delete_link ) ) . '" class="submitdelete" onclick="return confirm(\'' . esc_attr( __( 'Are you sure you want to delete that?', 'formidable' ) ) . '\')">' . __( 'Delete' ) . '</a>';
-	    }
+		}
 
-        $actions = apply_filters('frm_row_actions', $actions, $item);
-    }
+		$actions = apply_filters('frm_row_actions', $actions, $item);
+	}
 
 	private function get_column_value( $item, &$val ) {
 		$col_name = $this->column_name;

Spacing +10 added lines, -10 removed lines

@@ -23,7 +23,7 @@ 
 			$join_form_in_query = true;
 		}
 
-		$s = isset( $_REQUEST['s'] ) ? stripslashes($_REQUEST['s']) : '';
+		$s = isset( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : '';
 
 	    if ( $s != '' && FrmAppHelper::pro_is_installed() ) {
 	        $fid = isset( $_REQUEST['fid'] ) ? sanitize_title( $_REQUEST['fid'] ) : '';
@@ -33,7 +33,7 @@ 
 		$s_query = apply_filters( 'frm_entries_list_query', $s_query, compact( 'form_id' ) );
 
         $orderby = isset( $_REQUEST['orderby'] ) ? sanitize_title( $_REQUEST['orderby'] ) : $default_orderby;
-        if ( strpos($orderby, 'meta') !== false ) {
+        if ( strpos( $orderby, 'meta' ) !== false ) {
             $order_field_type = FrmField::get_type( str_replace( 'meta_', '', $orderby ) );
 			$orderby .= in_array( $order_field_type, array( 'number', 'scale' ) ) ? ' +0 ' : '';
         }
@@ -46,7 +46,7 @@ 
 
 		$limit = FrmDb::esc_limit( $start . ',' . $per_page );
 		$this->items = FrmEntry::getAll( $s_query, $order, $limit, true, $join_form_in_query );
-        $total_items = FrmEntry::getRecordCount($s_query);
+        $total_items = FrmEntry::getRecordCount( $s_query );
 
 		$this->set_pagination_args( array(
 			'total_items' => $total_items,
@@ -56,7 +56,7 @@ 
 
 	public function no_items() {
         $s = isset( $_REQUEST['s'] ) ? $_REQUEST['s'] : '';
-	    if ( ! empty($s) ) {
+	    if ( ! empty( $s ) ) {
             _e( 'No Entries Found', 'formidable' );
             return;
         }
@@ -65,7 +65,7 @@ 
 		$form = $this->params['form'];
 
         if ( $form_id ) {
-            $form = FrmForm::getOne($form_id);
+            $form = FrmForm::getOne( $form_id );
         }
         $colspan = $this->get_column_count();
 
@@ -123,7 +123,7 @@ 
 
 		$r = "<tr id='item-action-{$item->id}'$style>";
 
-		list( $columns, $hidden, , $primary ) = $this->get_column_info();
+		list( $columns, $hidden,, $primary ) = $this->get_column_info();
         $action_col = false;
 
 		foreach ( $columns as $column_name => $column_display_name ) {
@@ -140,7 +140,7 @@ 
             }
 
 			$attributes = 'class="' . esc_attr( $class ) . '"';
-			unset($class);
+			unset( $class );
 			$attributes .= ' data-colname="' . $column_display_name . '"';
 
 			$form_id = $this->params['form'] ? $this->params['form'] : 0;
@@ -165,7 +165,7 @@ 
 			    }
 			    $r .= '</td>';
 			}
-			unset($val);
+			unset( $val );
 		}
 		$r .= '</tr>';
 
@@ -222,12 +222,12 @@ 
     private function get_actions( &$actions, $item, $view_link ) {
 		$actions['view'] = '<a href="' . esc_url( $view_link ) . '">' . __( 'View', 'formidable' ) . '</a>';
 
-        if ( current_user_can('frm_delete_entries') ) {
+        if ( current_user_can( 'frm_delete_entries' ) ) {
 			$delete_link = '?page=formidable-entries&frm_action=destroy&id=' . $item->id . '&form=' . $this->params['form'];
 			$actions['delete'] = '<a href="' . esc_url( wp_nonce_url( $delete_link ) ) . '" class="submitdelete" onclick="return confirm(\'' . esc_attr( __( 'Are you sure you want to delete that?', 'formidable' ) ) . '\')">' . __( 'Delete' ) . '</a>';
 	    }
 
-        $actions = apply_filters('frm_row_actions', $actions, $item);
+        $actions = apply_filters( 'frm_row_actions', $actions, $item );
     }
 
 	private function get_column_value( $item, &$val ) {

classes/models/FrmStyle.php

Indentation +271 added lines, -271 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 = 2147483647;
-        $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 = 2147483647;
+		$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,46 +54,46 @@ 
  			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 ( ! isset( $new_instance['post_content'][ $setting ] ) ) {
 					$new_instance['post_content'][ $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;
-                } else if ( $setting == 'font' ) {
-                	$new_instance['post_content'][ $setting ] = $this->force_balanced_quotation( $new_instance['post_content'][ $setting ] );
-                }
-            }
+				} else if ( $setting == 'font' ) {
+					$new_instance['post_content'][ $setting ] = $this->force_balanced_quotation( $new_instance['post_content'][ $setting ] );
+				}
+			}
 
 			$all_instances[ $number ] = $new_instance;
 
-            $action_ids[] = $this->save($new_instance);
+			$action_ids[] = $this->save($new_instance);
 
  		}
 
@@ -102,16 +102,16 @@ 
  		return $action_ids;
  	}
 
-    /**
-     * Create static css file
-     */
+	/**
+	 * Create static css file
+	 */
 	public function save_settings() {
 		$filename = FrmAppHelper::plugin_path() . '/css/custom_theme.css.php';
 		update_option( 'frm_last_style_update', date('njGi') );
 
-        if ( ! is_file($filename) ) {
-            return;
-        }
+		if ( ! is_file($filename) ) {
+			return;
+		}
 
 		$this->clear_cache();
 
@@ -120,9 +120,9 @@ 
 		$create_file = new FrmCreateFile( array( 'folder_name' => 'formidable/css', 'file_name' => 'formidablepro.css' ) );
 		$create_file->create_file( $css );
 
-        update_option('frmpro_css', $css);
+		update_option('frmpro_css', $css);
 
-        set_transient('frmpro_css', $css);
+		set_transient('frmpro_css', $css);
 	}
 
 	private function get_css_content( $filename ) {
@@ -131,10 +131,10 @@ 
 		$saving = true;
 		$frm_style = $this;
 
-        ob_start();
-        include( $filename );
+		ob_start();
+		include( $filename );
 		$css .= preg_replace( '/\/\*(.|\s)*?\*\//', '', str_replace( array( "\r\n", "\r", "\n", "\t", '    ' ), '', ob_get_contents() ) );
-        ob_end_clean();
+		ob_end_clean();
 
 		return $css;
 	}
@@ -154,269 +154,269 @@ 
 	}
 
 	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 = FrmDb::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
+		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 = FrmDb::check_cache('frm_backup_style_check', 'frm_styles', $query, 'get_results');
+			$temp_styles = FrmDb::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();
+			if ( empty($temp_styles) ) {
+				// create a new style if there are none
+		 		$new = $this->get_new();
 				$new->post_title = __( 'Formidable Style', 'formidable' );
 				$new->post_name = $new->post_title;
-         		$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);
+		 		$new->menu_order = 1;
+		 		$new = $this->save( (array) $new);
+		 		$this->update('default');
+
+				$post_atts['include'] = $new;
+
+				$temp_styles = get_posts( $post_atts );
+			}
+		}
+
+		$default_values = $this->get_defaults();
+		$default_style = false;
+
+		$styles = array();
+		foreach ( $temp_styles as $style ) {
+			$this->id = $style->ID;
+			if ( $style->menu_order ) {
+				if ( $default_style ) {
+					// only return one default
+					$style->menu_order = 0;
+				} else {
+					// check for a default style
+					$default_style = $style->ID;
+				}
+			}
+
+			$style->post_content = FrmAppHelper::maybe_json_decode($style->post_content);
+
+			// fill default values
+			$style->post_content = $this->override_defaults($style->post_content);
+			$style->post_content = wp_parse_args( $style->post_content, $default_values);
 
 			$styles[ $style->ID ] = $style;
-        }
+		}
 
-        if ( ! $default_style ) {
-            $default_style = reset($styles);
+		if ( ! $default_style ) {
+			$default_style = reset($styles);
 			$styles[ $default_style->ID ]->menu_order = 1;
-        }
+		}
 
-        return $styles;
-    }
+		return $styles;
+	}
 
 	public function get_default_style( $styles = null ) {
-        if ( ! isset($styles) ) {
+		if ( ! isset($styles) ) {
 			$styles = $this->get_all( 'menu_order', 'DESC', 1 );
-        }
+		}
 
-        foreach ( $styles as $style ) {
-            if ( $style->menu_order ) {
-                return $style;
-            }
-        }
-    }
+		foreach ( $styles as $style ) {
+			if ( $style->menu_order ) {
+				return $style;
+			}
+		}
+	}
 
 	public function override_defaults( $settings ) {
-	    if ( ! is_array($settings) ) {
-	        return $settings;
-	    }
-
-	    $settings['line_height'] = ( ! isset($settings['field_height']) || $settings['field_height'] == '' || $settings['field_height'] == 'auto') ? 'normal' : $settings['field_height'];
-
-	    if ( ! isset($settings['form_desc_size']) && isset($settings['description_font_size']) ) {
-	        $settings['form_desc_size'] = $settings['description_font_size'];
-	        $settings['form_desc_color'] = $settings['description_color'];
-	        $settings['title_color'] = $settings['label_color'];
-	    }
-
-	    if ( ! isset($settings['section_color']) && isset($settings['label_color']) ) {
-	        $settings['section_color'] = $settings['label_color'];
-	        $settings['section_border_color'] = $settings['border_color'];
-	    }
-
-	    if ( ! isset($settings['submit_hover_bg_color']) && isset($settings['submit_bg_color']) ) {
-	        $settings['submit_hover_bg_color'] = $settings['submit_bg_color'];
-	        $settings['submit_hover_color'] = $settings['submit_text_color'];
-	        $settings['submit_hover_border_color'] = $settings['submit_border_color'];
-
-	        $settings['submit_active_bg_color'] = $settings['submit_bg_color'];
-	        $settings['submit_active_color'] = $settings['submit_text_color'];
-            $settings['submit_active_border_color'] = $settings['submit_border_color'];
-	    }
-
-	    return $settings;
+		if ( ! is_array($settings) ) {
+			return $settings;
+		}
+
+		$settings['line_height'] = ( ! isset($settings['field_height']) || $settings['field_height'] == '' || $settings['field_height'] == 'auto') ? 'normal' : $settings['field_height'];
+
+		if ( ! isset($settings['form_desc_size']) && isset($settings['description_font_size']) ) {
+			$settings['form_desc_size'] = $settings['description_font_size'];
+			$settings['form_desc_color'] = $settings['description_color'];
+			$settings['title_color'] = $settings['label_color'];
+		}
+
+		if ( ! isset($settings['section_color']) && isset($settings['label_color']) ) {
+			$settings['section_color'] = $settings['label_color'];
+			$settings['section_border_color'] = $settings['border_color'];
+		}
+
+		if ( ! isset($settings['submit_hover_bg_color']) && isset($settings['submit_bg_color']) ) {
+			$settings['submit_hover_bg_color'] = $settings['submit_bg_color'];
+			$settings['submit_hover_color'] = $settings['submit_text_color'];
+			$settings['submit_hover_border_color'] = $settings['submit_border_color'];
+
+			$settings['submit_active_bg_color'] = $settings['submit_bg_color'];
+			$settings['submit_active_color'] = $settings['submit_text_color'];
+			$settings['submit_active_border_color'] = $settings['submit_border_color'];
+		}
+
+		return $settings;
 	}
 
 	public function get_defaults() {
-        return array(
-            'theme_css'         => 'ui-lightness',
-            'theme_name'        => 'UI Lightness',
+		return array(
+			'theme_css'         => 'ui-lightness',
+			'theme_name'        => 'UI Lightness',
 
 			'center_form'		=> '',
-            'form_width'        => '100%',
-            'form_align'        => 'left',
-            'direction'         => is_rtl() ? 'rtl' : 'ltr',
-            'fieldset'          => '0px',
-            'fieldset_color'    => '000000',
-            'fieldset_padding'  => '0 0 15px 0',
-            'fieldset_bg_color' => '',
-
-            'title_size'        => '20px',
-            'title_color'       => '444444',
+			'form_width'        => '100%',
+			'form_align'        => 'left',
+			'direction'         => is_rtl() ? 'rtl' : 'ltr',
+			'fieldset'          => '0px',
+			'fieldset_color'    => '000000',
+			'fieldset_padding'  => '0 0 15px 0',
+			'fieldset_bg_color' => '',
+
+			'title_size'        => '20px',
+			'title_color'       => '444444',
 			'title_margin_top'  => '10px',
 			'title_margin_bottom' => '10px',
-            'form_desc_size'    => '14px',
-            'form_desc_color'   => '666666',
+			'form_desc_size'    => '14px',
+			'form_desc_color'   => '666666',
 			'form_desc_margin_top' => '10px',
 			'form_desc_margin_bottom' => '25px',
 
-            'font'              => '"Lucida Grande","Lucida Sans Unicode",Tahoma,sans-serif',
-            'font_size'         => '14px',
-            'label_color'       => '444444',
-            'weight'            => 'bold',
-            'position'          => 'none',
-            'align'             => 'left',
-            'width'             => '150px',
-            'required_color'    => 'B94A48',
-            'required_weight'   => 'bold',
-            'label_padding'     => '0 0 3px 0',
-
-            'description_font_size' => '12px',
-            'description_color' => '666666',
-            'description_weight' => 'normal',
-            'description_style' => 'normal',
-            'description_align' => 'left',
+			'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',
 			'description_margin' => '0',
 
-            'field_font_size'   => '14px',
-            'field_height' 		=> '32px',
-            'line_height'		=> 'normal',
-            'field_width'       => '100%',
-            'auto_width'        => false,
-            'field_pad'         => '6px 10px',
-            'field_margin'      => '20px',
+			'field_font_size'   => '14px',
+			'field_height' 		=> '32px',
+			'line_height'		=> 'normal',
+			'field_width'       => '100%',
+			'auto_width'        => false,
+			'field_pad'         => '6px 10px',
+			'field_margin'      => '20px',
 			'field_weight' => 'normal',
-            'text_color'        => '555555',
-            //'border_color_hv'   => 'cccccc',
-            'border_color'      => 'cccccc',
-            'field_border_width' => '1px',
-            'field_border_style' => 'solid',
-
-            'bg_color'          => 'ffffff',
-            //'bg_color_hv'       => 'ffffff',
+			'text_color'        => '555555',
+			//'border_color_hv'   => 'cccccc',
+			'border_color'      => 'cccccc',
+			'field_border_width' => '1px',
+			'field_border_style' => 'solid',
+
+			'bg_color'          => 'ffffff',
+			//'bg_color_hv'       => 'ffffff',
 			'remove_box_shadow' => '',
-            'bg_color_active'   => 'ffffff',
+			'bg_color_active'   => 'ffffff',
 			'border_color_active' => '66afe9',
 			'remove_box_shadow_active' => '',
-            'text_color_error'  => '444444',
-            'bg_color_error'    => 'ffffff',
+			'text_color_error'  => '444444',
+			'bg_color_error'    => 'ffffff',
 			'border_color_error' => 'B94A48',
 			'border_width_error' => '1px',
 			'border_style_error' => 'solid',
-            'bg_color_disabled' => 'ffffff',
-            'border_color_disabled' => 'E5E5E5',
-            'text_color_disabled' => 'A1A1A1',
-
-            'radio_align'       => 'block',
-            'check_align'       => 'block',
-            'check_font_size'   => '13px',
-            'check_label_color' => '444444',
-            'check_weight'      => 'normal',
-
-            'section_font_size' => '18px',
-            'section_color'     => '444444',
-            'section_weight'    => 'bold',
-            'section_pad'       => '15px 0 3px 0',
-            'section_mar_top'   => '15px',
+			'bg_color_disabled' => 'ffffff',
+			'border_color_disabled' => 'E5E5E5',
+			'text_color_disabled' => 'A1A1A1',
+
+			'radio_align'       => 'block',
+			'check_align'       => 'block',
+			'check_font_size'   => '13px',
+			'check_label_color' => '444444',
+			'check_weight'      => 'normal',
+
+			'section_font_size' => '18px',
+			'section_color'     => '444444',
+			'section_weight'    => 'bold',
+			'section_pad'       => '15px 0 3px 0',
+			'section_mar_top'   => '15px',
 			'section_mar_bottom' => '12px',
-            'section_bg_color'  => '',
-            'section_border_color' => 'e8e8e8',
-            'section_border_width' => '2px',
-            'section_border_style' => 'solid',
-            'section_border_loc' => '-top',
-            'collapse_icon'     => '6',
-            'collapse_pos'      => 'after',
-            'repeat_icon'       => '1',
-
-            'submit_style'      => false,
-            'submit_font_size'  => '14px',
-            'submit_width'      => 'auto',
-            'submit_height'     => 'auto',
-            'submit_bg_color'   => 'ffffff',
-            'submit_border_color' => 'cccccc',
-            'submit_border_width' => '1px',
-            'submit_text_color' => '444444',
-            'submit_weight'     => 'normal',
-            'submit_border_radius' => '4px',
-            'submit_bg_img'     => '',
-            'submit_margin'     => '10px',
-            'submit_padding'    => '6px 11px',
-            'submit_shadow_color' => 'eeeeee',
-            'submit_hover_bg_color' => 'efefef',
-            'submit_hover_color' => '444444',
-            'submit_hover_border_color' => 'cccccc',
-            'submit_active_bg_color' => 'efefef',
-            'submit_active_color' => '444444',
-            'submit_active_border_color' => 'cccccc',
-
-            'border_radius'     => '4px',
-            'error_bg'          => 'F2DEDE',
-            'error_border'      => 'EBCCD1',
-            'error_text'        => 'B94A48',
-            'error_font_size'   => '14px',
-
-            'success_bg_color'  => 'DFF0D8',
-            'success_border_color' => 'D6E9C6',
-            'success_text_color' => '468847',
-            'success_font_size' => '14px',
-
-            'important_style'   => false,
+			'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,
 
 			'progress_bg_color'     => 'dddddd',
 			'progress_active_color' => 'ffffff',
@@ -426,9 +426,9 @@ 
 			'progress_border_size'  => '2px',
 			'progress_size'         => '30px',
 
-            'custom_css'        => '',
-        );
-    }
+			'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 +44 added lines, -44 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
 
 	/**
@@ -15,7 +15,7 @@ 
 
         $max_slug_value = 2147483647;
         $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,33 +67,33 @@ 
  			$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'];
             }
 
             $default_settings = $this->get_defaults();
 
             foreach ( $default_settings as $setting => $default ) {
-				if ( ! isset( $new_instance['post_content'][ $setting ] ) ) {
-					$new_instance['post_content'][ $setting ] = $default;
+				if ( ! isset( $new_instance['post_content'][$setting] ) ) {
+					$new_instance['post_content'][$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;
                 } else if ( $setting == 'font' ) {
-                	$new_instance['post_content'][ $setting ] = $this->force_balanced_quotation( $new_instance['post_content'][ $setting ] );
+                	$new_instance['post_content'][$setting] = $this->force_balanced_quotation( $new_instance['post_content'][$setting] );
                 }
             }
 
-			$all_instances[ $number ] = $new_instance;
+			$all_instances[$number] = $new_instance;
 
-            $action_ids[] = $this->save($new_instance);
+            $action_ids[] = $this->save( $new_instance );
 
  		}
 
@@ -107,9 +107,9 @@ 
      */
 	public function save_settings() {
 		$filename = FrmAppHelper::plugin_path() . '/css/custom_theme.css.php';
-		update_option( 'frm_last_style_update', date('njGi') );
+		update_option( 'frm_last_style_update', date( 'njGi' ) );
 
-        if ( ! is_file($filename) ) {
+        if ( ! is_file( $filename ) ) {
             return;
         }
 
@@ -120,9 +120,9 @@ 
 		$create_file = new FrmCreateFile( array( 'folder_name' => 'formidable/css', 'file_name' => 'formidablepro.css' ) );
 		$create_file->create_file( $css );
 
-        update_option('frmpro_css', $css);
+        update_option( 'frmpro_css', $css );
 
-        set_transient('frmpro_css', $css);
+        set_transient( 'frmpro_css', $css );
 	}
 
 	private function get_css_content( $filename ) {
@@ -154,7 +154,7 @@ 
 	}
 
 	public function destroy( $id ) {
-        return wp_delete_post($id);
+        return wp_delete_post( $id );
     }
 
     public function get_one() {
@@ -168,19 +168,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;
     }
@@ -196,20 +196,20 @@ 
 
 		$temp_styles = FrmDb::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 = FrmDb::check_cache('frm_backup_style_check', 'frm_styles', $query, 'get_results');
+            $temp_styles = FrmDb::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 = __( 'Formidable Style', 'formidable' );
 				$new->post_name = $new->post_title;
          		$new->menu_order = 1;
-         		$new = $this->save( (array) $new);
-         		$this->update('default');
+         		$new = $this->save( (array) $new );
+         		$this->update( 'default' );
 
                 $post_atts['include'] = $new;
 
@@ -233,25 +233,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 );
         }
 
@@ -263,24 +263,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'];

classes/models/FrmEntry.php

Indentation +354 added lines, -354 removed lines

@@ -6,11 +6,11 @@ 
 class FrmEntry {
 
 	/**
-	* Create a new entry
-	*
-	* @param array $values
-	* @return int | boolean $entry_id
-	*/
+	 * Create a new entry
+	 *
+	 * @param array $values
+	 * @return int | boolean $entry_id
+	 */
 	public static function create( $values ) {
 		$entry_id = self::create_entry( $values, 'standard' );
 
@@ -18,12 +18,12 @@ 
 	}
 
 	/**
-	* Create a new entry with some differences depending on type
-	*
-	* @param array $values
-	* @param string $type
-	* @return int | boolean $entry_id
-	*/
+	 * Create a new entry with some differences depending on type
+	 *
+	 * @param array $values
+	 * @param string $type
+	 * @return int | boolean $entry_id
+	 */
 	private static function create_entry( $values, $type ) {
 		$new_values = self::before_insert_entry_in_database( $values, $type );
 
@@ -37,10 +37,10 @@ 
 		return $entry_id;
 	}
 
-    /**
-     * check for duplicate entries created in the last minute
-     * @return boolean
-     */
+	/**
+	 * check for duplicate entries created in the last minute
+	 * @return boolean
+	 */
 	public static function is_duplicate( $new_values, $values ) {
 		$duplicate_entry_time = apply_filters( 'frm_time_to_check_duplicates', 60, $new_values );
 
@@ -48,55 +48,55 @@ 
 			return false;
 		}
 
-        $check_val = $new_values;
+		$check_val = $new_values;
 		$check_val['created_at >'] = date( 'Y-m-d H:i:s', ( strtotime( $new_values['created_at'] ) - absint( $duplicate_entry_time ) ) );
 
 		unset( $check_val['created_at'], $check_val['updated_at'] );
 		unset( $check_val['is_draft'], $check_val['id'], $check_val['item_key'] );
 
-        if ( $new_values['item_key'] == $new_values['name'] ) {
-            unset($check_val['name']);
-        }
+		if ( $new_values['item_key'] == $new_values['name'] ) {
+			unset($check_val['name']);
+		}
 
-        global $wpdb;
+		global $wpdb;
 		$entry_exists = FrmDb::get_col( $wpdb->prefix . 'frm_items', $check_val, 'id', array( 'order_by' => 'created_at DESC' ) );
 
-        if ( ! $entry_exists || empty($entry_exists) || ! isset($values['item_meta']) ) {
-            return false;
-        }
+		if ( ! $entry_exists || empty($entry_exists) || ! isset($values['item_meta']) ) {
+			return false;
+		}
 
-        $is_duplicate = false;
-        foreach ( $entry_exists as $entry_exist ) {
-            $is_duplicate = true;
+		$is_duplicate = false;
+		foreach ( $entry_exists as $entry_exist ) {
+			$is_duplicate = true;
 
-            //add more checks here to make sure it's a duplicate
-            $metas = FrmEntryMeta::get_entry_meta_info($entry_exist);
-            $field_metas = array();
-            foreach ( $metas as $meta ) {
+			//add more checks here to make sure it's a duplicate
+			$metas = FrmEntryMeta::get_entry_meta_info($entry_exist);
+			$field_metas = array();
+			foreach ( $metas as $meta ) {
 				$field_metas[ $meta->field_id ] = $meta->meta_value;
-            }
-
-            // If prev entry is empty and current entry is not, they are not duplicates
-            $filtered_vals = array_filter( $values['item_meta'] );
-            if ( empty( $field_metas ) && ! empty( $filtered_vals ) ) {
-                return false;
-            }
-
-            $diff = array_diff_assoc($field_metas, array_map('maybe_serialize', $values['item_meta']));
-            foreach ( $diff as $field_id => $meta_value ) {
-                if ( ! empty($meta_value) ) {
-                    $is_duplicate = false;
-                    continue;
-                }
-            }
-
-            if ( $is_duplicate ) {
+			}
+
+			// If prev entry is empty and current entry is not, they are not duplicates
+			$filtered_vals = array_filter( $values['item_meta'] );
+			if ( empty( $field_metas ) && ! empty( $filtered_vals ) ) {
+				return false;
+			}
+
+			$diff = array_diff_assoc($field_metas, array_map('maybe_serialize', $values['item_meta']));
+			foreach ( $diff as $field_id => $meta_value ) {
+				if ( ! empty($meta_value) ) {
+					$is_duplicate = false;
+					continue;
+				}
+			}
+
+			if ( $is_duplicate ) {
 				break;
-            }
-        }
+			}
+		}
 
-        return $is_duplicate;
-    }
+		return $is_duplicate;
+	}
 
 	/**
 	 * Determine if an entry needs to be checked as a possible duplicate
@@ -125,48 +125,48 @@ 
 		return true;
 	}
 
-    public static function duplicate( $id ) {
-        global $wpdb;
+	public static function duplicate( $id ) {
+		global $wpdb;
 
-        $values = self::getOne( $id );
+		$values = self::getOne( $id );
 
-        $new_values = array();
+		$new_values = array();
 		$new_values['item_key'] = FrmAppHelper::get_unique_key( '', $wpdb->prefix . 'frm_items', 'item_key' );
-        $new_values['name'] = $values->name;
-        $new_values['is_draft'] = $values->is_draft;
+		$new_values['name'] = $values->name;
+		$new_values['is_draft'] = $values->is_draft;
 		$new_values['user_id'] = (int) $values->user_id;
 		$new_values['updated_by'] = (int) $values->user_id;
-        $new_values['form_id'] = $values->form_id ? (int) $values->form_id: null;
+		$new_values['form_id'] = $values->form_id ? (int) $values->form_id: null;
 		$new_values['created_at'] = current_time( 'mysql', 1 );
 		$new_values['updated_at'] = $new_values['created_at'];
 
 		$query_results = $wpdb->insert( $wpdb->prefix . 'frm_items', $new_values );
-        if ( ! $query_results ) {
-            return false;
-        }
+		if ( ! $query_results ) {
+			return false;
+		}
 
-        $entry_id = $wpdb->insert_id;
+		$entry_id = $wpdb->insert_id;
 
-        global $frm_vars;
-        if ( ! isset($frm_vars['saved_entries']) ) {
-            $frm_vars['saved_entries'] = array();
-        }
-        $frm_vars['saved_entries'][] = (int) $entry_id;
+		global $frm_vars;
+		if ( ! isset($frm_vars['saved_entries']) ) {
+			$frm_vars['saved_entries'] = array();
+		}
+		$frm_vars['saved_entries'][] = (int) $entry_id;
 
-        FrmEntryMeta::duplicate_entry_metas($id, $entry_id);
+		FrmEntryMeta::duplicate_entry_metas($id, $entry_id);
 		self::clear_cache();
 
 		do_action( 'frm_after_duplicate_entry', $entry_id, $new_values['form_id'], array( 'old_id' => $id ) );
-        return $entry_id;
-    }
+		return $entry_id;
+	}
 
 	/**
-	* Update an entry (not via XML)
-	*
-	* @param int $id
-	* @param array $values
-	* @return boolean|int $update_results
-	*/
+	 * Update an entry (not via XML)
+	 *
+	 * @param int $id
+	 * @param array $values
+	 * @return boolean|int $update_results
+	 */
 	public static function update( $id, $values ) {
 		$update_results = self::update_entry( $id, $values, 'standard' );
 
@@ -174,14 +174,14 @@ 
 	}
 
 	/**
-	* Update an entry with some differences depending on the update type
-	*
-	* @since 2.0.16
-	*
-	* @param int $id
-	* @param array $values
-	* @return boolean|int $query_results
-	*/
+	 * Update an entry with some differences depending on the update type
+	 *
+	 * @since 2.0.16
+	 *
+	 * @param int $id
+	 * @param array $values
+	 * @return boolean|int $query_results
+	 */
 	private static function update_entry( $id, $values, $update_type ) {
 		global $wpdb;
 
@@ -200,34 +200,34 @@ 
 	}
 
 	public static function destroy( $id ) {
-        global $wpdb;
-        $id = (int) $id;
+		global $wpdb;
+		$id = (int) $id;
 
 		$entry = self::getOne( $id );
-        if ( ! $entry ) {
-            $result = false;
-            return $result;
-        }
+		if ( ! $entry ) {
+			$result = false;
+			return $result;
+		}
 
-        do_action('frm_before_destroy_entry', $id, $entry);
+		do_action('frm_before_destroy_entry', $id, $entry);
 
 		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_item_metas WHERE item_id=%d', $id ) );
 		$result = $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_items WHERE id=%d', $id ) );
 
 		self::clear_cache();
 
-        return $result;
-    }
+		return $result;
+	}
 
 	public static function update_form( $id, $value, $form_id ) {
-        global $wpdb;
-        $form_id = isset($value) ? $form_id : null;
+		global $wpdb;
+		$form_id = isset($value) ? $form_id : null;
 		$result = $wpdb->update( $wpdb->prefix . 'frm_items', array( 'form_id' => $form_id ), array( 'id' => $id ) );
 		if ( $result ) {
 			self::clear_cache();
 		}
-        return $result;
-    }
+		return $result;
+	}
 
 	/**
 	 * Clear entry caching
@@ -263,159 +263,159 @@ 
 	}
 
 	public static function getOne( $id, $meta = false ) {
-        global $wpdb;
+		global $wpdb;
 
-        $query = "SELECT it.*, fr.name as form_name, fr.form_key as form_key FROM {$wpdb->prefix}frm_items it
+		$query = "SELECT it.*, fr.name as form_name, fr.form_key as form_key FROM {$wpdb->prefix}frm_items it
                   LEFT OUTER JOIN {$wpdb->prefix}frm_forms fr ON it.form_id=fr.id WHERE ";
 
-        $query .= is_numeric($id) ? 'it.id=%d' : 'it.item_key=%s';
-        $query_args = array( $id );
-        $query = $wpdb->prepare( $query, $query_args );
+		$query .= is_numeric($id) ? 'it.id=%d' : 'it.item_key=%s';
+		$query_args = array( $id );
+		$query = $wpdb->prepare( $query, $query_args );
 
-        if ( ! $meta ) {
+		if ( ! $meta ) {
 			$entry = FrmDb::check_cache( $id . '_nometa', 'frm_entry', $query, 'get_row' );
-            return stripslashes_deep($entry);
-        }
+			return stripslashes_deep($entry);
+		}
 
-        $entry = FrmDb::check_cache( $id, 'frm_entry' );
-        if ( $entry !== false ) {
-            return stripslashes_deep($entry);
-        }
+		$entry = FrmDb::check_cache( $id, 'frm_entry' );
+		if ( $entry !== false ) {
+			return stripslashes_deep($entry);
+		}
 
-        $entry = $wpdb->get_row( $query );
-        $entry = self::get_meta($entry);
+		$entry = $wpdb->get_row( $query );
+		$entry = self::get_meta($entry);
 
-        return stripslashes_deep($entry);
-    }
+		return stripslashes_deep($entry);
+	}
 
 	public static function get_meta( $entry ) {
-        if ( ! $entry ) {
-            return $entry;
-        }
+		if ( ! $entry ) {
+			return $entry;
+		}
 
-        global $wpdb;
+		global $wpdb;
 		$metas = FrmDb::get_results( $wpdb->prefix . 'frm_item_metas m LEFT JOIN ' . $wpdb->prefix . 'frm_fields f ON m.field_id=f.id', array( 'item_id' => $entry->id, 'field_id !' => 0 ), 'field_id, meta_value, field_key, item_id' );
 
-        $entry->metas = array();
+		$entry->metas = array();
 
 		$include_key = apply_filters( 'frm_include_meta_keys', false, array( 'form_id' => $entry->form_id ) );
-        foreach ( $metas as $meta_val ) {
-            if ( $meta_val->item_id == $entry->id ) {
+		foreach ( $metas as $meta_val ) {
+			if ( $meta_val->item_id == $entry->id ) {
 				$entry->metas[ $meta_val->field_id ] = maybe_unserialize( $meta_val->meta_value );
 				if ( $include_key ) {
 					$entry->metas[ $meta_val->field_key ] = $entry->metas[ $meta_val->field_id ];
 				}
-                 continue;
-            }
+				 continue;
+			}
 
-            // include sub entries in an array
+			// include sub entries in an array
 			if ( ! isset( $entry_metas[ $meta_val->field_id ] ) ) {
 				$entry->metas[ $meta_val->field_id ] = array();
-            }
+			}
 
 			$entry->metas[ $meta_val->field_id ][] = maybe_unserialize( $meta_val->meta_value );
 
-            unset($meta_val);
-        }
-        unset($metas);
+			unset($meta_val);
+		}
+		unset($metas);
 
 		FrmDb::set_cache( $entry->id, $entry, 'frm_entry' );
 
-        return $entry;
-    }
+		return $entry;
+	}
 
-    /**
-     * @param string $id
-     */
+	/**
+	 * @param string $id
+	 */
 	public static function exists( $id ) {
-        global $wpdb;
-
-        if ( FrmDb::check_cache( $id, 'frm_entry' ) ) {
-            $exists = true;
-            return $exists;
-        }
-
-        if ( is_numeric($id) ) {
-            $where = array( 'id' => $id );
-        } else {
-            $where = array( 'item_key' => $id );
-        }
+		global $wpdb;
+
+		if ( FrmDb::check_cache( $id, 'frm_entry' ) ) {
+			$exists = true;
+			return $exists;
+		}
+
+		if ( is_numeric($id) ) {
+			$where = array( 'id' => $id );
+		} else {
+			$where = array( 'item_key' => $id );
+		}
 		$id = FrmDb::get_var( $wpdb->prefix . 'frm_items', $where );
 
-        $exists = ($id && $id > 0) ? true : false;
-        return $exists;
-    }
+		$exists = ($id && $id > 0) ? true : false;
+		return $exists;
+	}
 
-    public static function getAll( $where, $order_by = '', $limit = '', $meta = false, $inc_form = true ) {
+	public static function getAll( $where, $order_by = '', $limit = '', $meta = false, $inc_form = true ) {
 		global $wpdb;
 
-        $limit = FrmDb::esc_limit($limit);
+		$limit = FrmDb::esc_limit($limit);
 
-        $cache_key = maybe_serialize($where) . $order_by . $limit . $inc_form;
-        $entries = wp_cache_get($cache_key, 'frm_entry');
+		$cache_key = maybe_serialize($where) . $order_by . $limit . $inc_form;
+		$entries = wp_cache_get($cache_key, 'frm_entry');
 
-        if ( false === $entries ) {
-            $fields = 'it.id, it.item_key, it.name, it.ip, it.form_id, it.post_id, it.user_id, it.parent_item_id, it.updated_by, it.created_at, it.updated_at, it.is_draft';
+		if ( false === $entries ) {
+			$fields = 'it.id, it.item_key, it.name, it.ip, it.form_id, it.post_id, it.user_id, it.parent_item_id, it.updated_by, it.created_at, it.updated_at, it.is_draft';
 			$table = $wpdb->prefix . 'frm_items it ';
 
-            if ( $inc_form ) {
-                $fields = 'it.*, fr.name as form_name,fr.form_key as form_key';
-                $table .= 'LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fr ON it.form_id=fr.id ';
-            }
+			if ( $inc_form ) {
+				$fields = 'it.*, fr.name as form_name,fr.form_key as form_key';
+				$table .= 'LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fr ON it.form_id=fr.id ';
+			}
 
-            if ( preg_match( '/ meta_([0-9]+)/', $order_by, $order_matches ) ) {
-    		    // sort by a requested field
-                $field_id = (int) $order_matches[1];
+			if ( preg_match( '/ meta_([0-9]+)/', $order_by, $order_matches ) ) {
+				// sort by a requested field
+				$field_id = (int) $order_matches[1];
 				$fields .= ', (SELECT meta_value FROM ' . $wpdb->prefix . 'frm_item_metas WHERE field_id = ' . $field_id . ' AND item_id = it.id) as meta_' . $field_id;
 				unset( $order_matches, $field_id );
-		    }
+			}
 
 			// prepare the query
 			$query = 'SELECT ' . $fields . ' FROM ' . $table . FrmDb::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
 
-            $entries = $wpdb->get_results($query, OBJECT_K);
-            unset($query);
+			$entries = $wpdb->get_results($query, OBJECT_K);
+			unset($query);
 
 			FrmDb::set_cache( $cache_key, $entries, 'frm_entry' );
-        }
+		}
 
-        if ( ! $meta || ! $entries ) {
-            return stripslashes_deep($entries);
-        }
-        unset($meta);
+		if ( ! $meta || ! $entries ) {
+			return stripslashes_deep($entries);
+		}
+		unset($meta);
 
-        if ( ! is_array( $where ) && preg_match('/^it\.form_id=\d+$/', $where) ) {
+		if ( ! is_array( $where ) && preg_match('/^it\.form_id=\d+$/', $where) ) {
 			$where = array( 'it.form_id' => substr( $where, 11 ) );
-        }
+		}
 
-        $meta_where = array( 'field_id !' => 0 );
-        if ( $limit == '' && is_array($where) && count($where) == 1 && isset($where['it.form_id']) ) {
-            $meta_where['fi.form_id'] = $where['it.form_id'];
-        } else {
-            $meta_where['item_id'] = array_keys( $entries );
-        }
+		$meta_where = array( 'field_id !' => 0 );
+		if ( $limit == '' && is_array($where) && count($where) == 1 && isset($where['it.form_id']) ) {
+			$meta_where['fi.form_id'] = $where['it.form_id'];
+		} else {
+			$meta_where['item_id'] = array_keys( $entries );
+		}
 
-        $metas = FrmDb::get_results( $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON (it.field_id = fi.id)', $meta_where, 'item_id, meta_value, field_id, field_key, form_id' );
+		$metas = FrmDb::get_results( $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON (it.field_id = fi.id)', $meta_where, 'item_id, meta_value, field_id, field_key, form_id' );
 
-        unset( $meta_where );
+		unset( $meta_where );
 
-        if ( ! $metas ) {
-            return stripslashes_deep($entries);
-        }
+		if ( ! $metas ) {
+			return stripslashes_deep($entries);
+		}
 
-        foreach ( $metas as $m_key => $meta_val ) {
-            if ( ! isset( $entries[ $meta_val->item_id ] ) ) {
-                continue;
-            }
+		foreach ( $metas as $m_key => $meta_val ) {
+			if ( ! isset( $entries[ $meta_val->item_id ] ) ) {
+				continue;
+			}
 
-            if ( ! isset( $entries[ $meta_val->item_id ]->metas ) ) {
+			if ( ! isset( $entries[ $meta_val->item_id ]->metas ) ) {
 				$entries[ $meta_val->item_id ]->metas = array();
-            }
+			}
 
 			$entries[ $meta_val->item_id ]->metas[ $meta_val->field_id ] = maybe_unserialize( $meta_val->meta_value );
 
-            unset($m_key, $meta_val);
-        }
+			unset($m_key, $meta_val);
+		}
 
 		if ( ! FrmAppHelper::prevent_caching() ) {
 			foreach ( $entries as $entry ) {
@@ -424,31 +424,31 @@ 
 			}
 		}
 
-        return stripslashes_deep($entries);
-    }
+		return stripslashes_deep($entries);
+	}
 
-    // Pagination Methods
-    public static function getRecordCount( $where = '' ) {
-        global $wpdb;
+	// Pagination Methods
+	public static function getRecordCount( $where = '' ) {
+		global $wpdb;
 		$table_join = $wpdb->prefix . 'frm_items it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fr ON it.form_id=fr.id';
 
-        if ( is_numeric($where) ) {
-            $table_join = 'frm_items';
-            $where = array( 'form_id' => $where );
-        }
+		if ( is_numeric($where) ) {
+			$table_join = 'frm_items';
+			$where = array( 'form_id' => $where );
+		}
 
-        if ( is_array( $where ) ) {
-            $count = FrmDb::get_count( $table_join, $where );
-        } else {
+		if ( is_array( $where ) ) {
+			$count = FrmDb::get_count( $table_join, $where );
+		} else {
 			$cache_key = 'count_' . maybe_serialize( $where );
 			$query = 'SELECT COUNT(*) FROM ' . $table_join . FrmDb::prepend_and_or_where( ' WHERE ', $where );
 			$count = FrmDb::check_cache( $cache_key, 'frm_entry', $query, 'get_var' );
-        }
+		}
 
-        return $count;
-    }
+		return $count;
+	}
 
-    public static function getPageCount( $p_size, $where = '' ) {
+	public static function getPageCount( $p_size, $where = '' ) {
 		$p_size = (int) $p_size;
 		$count = 1;
 		if ( $p_size ) {
@@ -459,16 +459,16 @@ 
 		}
 
 		return $count;
-    }
+	}
 
 	/**
-	* Prepare the data before inserting it into the database
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @param string $type
-	* @return array $new_values
-	*/
+	 * Prepare the data before inserting it into the database
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @param string $type
+	 * @return array $new_values
+	 */
 	private static function before_insert_entry_in_database( &$values, $type ) {
 
 		self::sanitize_entry_post( $values );
@@ -483,13 +483,13 @@ 
 	}
 
 	/**
-	* Create an entry and perform after create actions
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @param array $new_values
-	* @return boolean|int $entry_id
-	*/
+	 * Create an entry and perform after create actions
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @param array $new_values
+	 * @return boolean|int $entry_id
+	 */
 	private static function continue_to_create_entry( $values, $new_values ) {
 		$entry_id = self::insert_entry_into_database( $new_values );
 		if ( ! $entry_id ) {
@@ -501,37 +501,37 @@ 
 		return $entry_id;
 	}
 
-    /**
-     * Sanitize the POST values before we use them
-     *
-     * @since 2.0
-     * @param array $values The POST values by reference
-     */
-    public static function sanitize_entry_post( &$values ) {
-        $sanitize_method = array(
-            'form_id'       => 'absint',
-            'frm_action'    => 'sanitize_title',
-            'form_key'      => 'sanitize_title',
-            'item_key'      => 'sanitize_title',
-            'item_name'     => 'sanitize_text_field',
-            'frm_saving_draft' => 'absint',
-            'is_draft'      => 'absint',
-            'post_id'       => 'absint',
-            'parent_item_id' => 'absint',
-            'created_at'    => 'sanitize_text_field',
-            'updated_at'    => 'sanitize_text_field',
-        );
-
-        FrmAppHelper::sanitize_request( $sanitize_method, $values );
-    }
+	/**
+	 * Sanitize the POST values before we use them
+	 *
+	 * @since 2.0
+	 * @param array $values The POST values by reference
+	 */
+	public static function sanitize_entry_post( &$values ) {
+		$sanitize_method = array(
+			'form_id'       => 'absint',
+			'frm_action'    => 'sanitize_title',
+			'form_key'      => 'sanitize_title',
+			'item_key'      => 'sanitize_title',
+			'item_name'     => 'sanitize_text_field',
+			'frm_saving_draft' => 'absint',
+			'is_draft'      => 'absint',
+			'post_id'       => 'absint',
+			'parent_item_id' => 'absint',
+			'created_at'    => 'sanitize_text_field',
+			'updated_at'    => 'sanitize_text_field',
+		);
+
+		FrmAppHelper::sanitize_request( $sanitize_method, $values );
+	}
 
 	/**
-	* Prepare the new values for inserting into the database
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return array $new_values
-	*/
+	 * Prepare the new values for inserting into the database
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return array $new_values
+	 */
 	private static function package_entry_data( &$values ) {
 		global $wpdb;
 
@@ -588,34 +588,34 @@ 
 	}
 
 	/**
-	* Get the is_draft value for a new entry
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return int
-	*/
+	 * Get the is_draft value for a new entry
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return int
+	 */
 	private static function get_is_draft_value( $values ) {
 		return ( ( isset( $values['frm_saving_draft'] ) && $values['frm_saving_draft'] == 1 ) || ( isset( $values['is_draft'] ) && $values['is_draft'] == 1 ) ) ? 1 : 0;
 	}
 
 	/**
-	* Get the created_at value for a new entry
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return string
-	*/
+	 * Get the created_at value for a new entry
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return string
+	 */
 	private static function get_created_at( $values ) {
 		return self::get_entry_value( $values, 'created_at', current_time( 'mysql', 1 ) );
 	}
 
 	/**
-	* Get the updated_at value for a new entry
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return string
-	*/
+	 * Get the updated_at value for a new entry
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return string
+	 */
 	private static function get_updated_at( $values ) {
 		if ( isset( $values['updated_at'] ) ) {
 			$updated_at = $values['updated_at'];
@@ -627,12 +627,12 @@ 
 	}
 
 	/**
-	* Get the description value for a new entry
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return string
-	*/
+	 * Get the description value for a new entry
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return string
+	 */
 	private static function get_entry_description( $values ) {
 		if ( isset( $values['description'] ) && ! empty( $values['description'] ) ) {
 			$description = maybe_serialize( $values['description'] );
@@ -647,12 +647,12 @@ 
 	}
 
 	/**
-	* Get the user_id value for a new entry
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return int
-	*/
+	 * Get the user_id value for a new entry
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return int
+	 */
 	private static function get_entry_user_id( $values ) {
 		if ( isset( $values['frm_user_id'] ) && ( is_numeric( $values['frm_user_id'] ) || FrmAppHelper::is_admin() ) ) {
 			$user_id = $values['frm_user_id'];
@@ -665,12 +665,12 @@ 
 	}
 
 	/**
-	* Insert new entry into the database
-	*
-	* @since 2.0.16
-	* @param array $new_values
-	* @return int | boolean $entry_id
-	*/
+	 * Insert new entry into the database
+	 *
+	 * @since 2.0.16
+	 * @param array $new_values
+	 * @return int | boolean $entry_id
+	 */
 	private static function insert_entry_into_database( $new_values ) {
 		global $wpdb;
 
@@ -686,11 +686,11 @@ 
 	}
 
 	/**
-	* Add the new entry to global $frm_vars
-	*
-	* @since 2.0.16
-	* @param int $entry_id
-	*/
+	 * Add the new entry to global $frm_vars
+	 *
+	 * @since 2.0.16
+	 * @param int $entry_id
+	 */
 	private static function add_new_entry_to_frm_vars( $entry_id ) {
 		global $frm_vars;
 
@@ -702,12 +702,12 @@ 
 	}
 
 	/**
-	* Add entry metas, if there are any
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @param int $entry_id
-	*/
+	 * Add entry metas, if there are any
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @param int $entry_id
+	 */
 	private static function maybe_add_entry_metas( $values, $entry_id ) {
 		if ( isset($values['item_meta']) ) {
 			FrmEntryMeta::update_entry_metas( $entry_id, $values['item_meta'] );
@@ -715,12 +715,12 @@ 
 	}
 
 	/**
-	* Trigger frm_after_create_entry hooks
-	*
-	* @since 2.0.16
-	* @param int $entry_id
-	* @param array $new_values
-	*/
+	 * Trigger frm_after_create_entry hooks
+	 *
+	 * @since 2.0.16
+	 * @param int $entry_id
+	 * @param array $new_values
+	 */
 	private static function after_entry_created_actions( $entry_id, $values, $new_values ) {
 		// this is a child entry
 		$is_child = isset( $values['parent_form_id'] ) && isset( $values['parent_nonce'] ) && ! empty( $values['parent_form_id'] ) && wp_verify_nonce( $values['parent_nonce'], 'parent' );
@@ -730,13 +730,13 @@ 
 	}
 
 	/**
-	* Actions to perform immediately after an entry is inserted in the frm_items database
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @param array $new_values
-	* @param int $entry_id
-	*/
+	 * Actions to perform immediately after an entry is inserted in the frm_items database
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @param array $new_values
+	 * @param int $entry_id
+	 */
 	private static function after_insert_entry_in_database( $values, $new_values, $entry_id ) {
 
 		self::add_new_entry_to_frm_vars( $entry_id );
@@ -749,14 +749,14 @@ 
 	}
 
 	/**
-	* Perform some actions right before updating an entry
-	*
-	* @since 2.0.16
-	* @param int $id
-	* @param array $values
-	* @param string $update_type
-	* @return boolean $update
-	*/
+	 * Perform some actions right before updating an entry
+	 *
+	 * @since 2.0.16
+	 * @param int $id
+	 * @param array $values
+	 * @param string $update_type
+	 * @return boolean $update
+	 */
 	private static function before_update_entry( $id, &$values, $update_type ) {
 		$update = true;
 
@@ -774,13 +774,13 @@ 
 	}
 
 	/**
-	* Package the entry data for updating
-	*
-	* @since 2.0.16
-	* @param int $id
-	* @param array $values
-	* @return array $new_values
-	*/
+	 * Package the entry data for updating
+	 *
+	 * @since 2.0.16
+	 * @param int $id
+	 * @param array $values
+	 * @return array $new_values
+	 */
 	private static function package_entry_to_update( $id, $values ) {
 		global $wpdb;
 
@@ -814,14 +814,14 @@ 
 	}
 
 	/**
-	* Perform some actions right after updating an entry
-	*
-	* @since 2.0.16
-	* @param boolean|int $query_results
-	* @param int $id
-	* @param array $values
-	* @param array $new_values
-	*/
+	 * Perform some actions right after updating an entry
+	 *
+	 * @since 2.0.16
+	 * @param boolean|int $query_results
+	 * @param int $id
+	 * @param array $values
+	 * @param array $new_values
+	 */
 	private static function after_update_entry( $query_results, $id, $values, $new_values ) {
 		if ( $query_results ) {
 			self::clear_cache();
@@ -843,13 +843,13 @@ 
 	}
 
 	/**
-	* Create entry from an XML import
-	* Certain actions aren't necessary when importing (like saving sub entries, checking for duplicates, etc.)
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return int | boolean $entry_id
-	*/
+	 * Create entry from an XML import
+	 * Certain actions aren't necessary when importing (like saving sub entries, checking for duplicates, etc.)
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return int | boolean $entry_id
+	 */
 	public static function create_entry_from_xml( $values ) {
 		$entry_id = self::create_entry( $values, 'xml' );
 
@@ -857,28 +857,28 @@ 
 	}
 
 	/**
-	* Update entry from an XML import
-	* Certain actions aren't necessary when importing (like saving sub entries and modifying other vals)
-	*
-	* @since 2.0.16
-	* @param int $id
-	* @param array $values
-	* @return int | boolean $updated
-	*/
+	 * Update entry from an XML import
+	 * Certain actions aren't necessary when importing (like saving sub entries and modifying other vals)
+	 *
+	 * @since 2.0.16
+	 * @param int $id
+	 * @param array $values
+	 * @return int | boolean $updated
+	 */
 	public static function update_entry_from_xml( $id, $values ) {
 		$updated = self::update_entry( $id, $values, 'xml' );
 
 		return $updated;
 	}
 
-    /**
-     * @param string $key
-     * @return int entry_id
-     */
+	/**
+	 * @param string $key
+	 * @return int entry_id
+	 */
 	public static function get_id_by_key( $key ) {
-        $entry_id = FrmDb::get_var( 'frm_items', array( 'item_key' => sanitize_title( $key ) ) );
-        return $entry_id;
-    }
+		$entry_id = FrmDb::get_var( 'frm_items', array( 'item_key' => sanitize_title( $key ) ) );
+		return $entry_id;
+	}
 
 	public static function validate( $values, $exclude = false ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmEntryValidate::validate' );

Spacing +63 added lines, -63 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -55,13 +55,13 @@ 
 		unset( $check_val['is_draft'], $check_val['id'], $check_val['item_key'] );
 
         if ( $new_values['item_key'] == $new_values['name'] ) {
-            unset($check_val['name']);
+            unset( $check_val['name'] );
         }
 
         global $wpdb;
 		$entry_exists = FrmDb::get_col( $wpdb->prefix . 'frm_items', $check_val, 'id', array( 'order_by' => 'created_at DESC' ) );
 
-        if ( ! $entry_exists || empty($entry_exists) || ! isset($values['item_meta']) ) {
+        if ( ! $entry_exists || empty( $entry_exists ) || ! isset( $values['item_meta'] ) ) {
             return false;
         }
 
@@ -70,10 +70,10 @@ 
             $is_duplicate = true;
 
             //add more checks here to make sure it's a duplicate
-            $metas = FrmEntryMeta::get_entry_meta_info($entry_exist);
+            $metas = FrmEntryMeta::get_entry_meta_info( $entry_exist );
             $field_metas = array();
             foreach ( $metas as $meta ) {
-				$field_metas[ $meta->field_id ] = $meta->meta_value;
+				$field_metas[$meta->field_id] = $meta->meta_value;
             }
 
             // If prev entry is empty and current entry is not, they are not duplicates
@@ -82,9 +82,9 @@ 
                 return false;
             }
 
-            $diff = array_diff_assoc($field_metas, array_map('maybe_serialize', $values['item_meta']));
+            $diff = array_diff_assoc( $field_metas, array_map( 'maybe_serialize', $values['item_meta'] ) );
             foreach ( $diff as $field_id => $meta_value ) {
-                if ( ! empty($meta_value) ) {
+                if ( ! empty( $meta_value ) ) {
                     $is_duplicate = false;
                     continue;
                 }
@@ -113,7 +113,7 @@ 
 		}
 
 		// If CSV is importing, don't check for duplicates
-		if ( defined('WP_IMPORTING') && WP_IMPORTING ) {
+		if ( defined( 'WP_IMPORTING' ) && WP_IMPORTING ) {
 			return false;
 		}
 
@@ -136,7 +136,7 @@ 
         $new_values['is_draft'] = $values->is_draft;
 		$new_values['user_id'] = (int) $values->user_id;
 		$new_values['updated_by'] = (int) $values->user_id;
-        $new_values['form_id'] = $values->form_id ? (int) $values->form_id: null;
+        $new_values['form_id'] = $values->form_id ? (int) $values->form_id : null;
 		$new_values['created_at'] = current_time( 'mysql', 1 );
 		$new_values['updated_at'] = $new_values['created_at'];
 
@@ -148,12 +148,12 @@ 
         $entry_id = $wpdb->insert_id;
 
         global $frm_vars;
-        if ( ! isset($frm_vars['saved_entries']) ) {
+        if ( ! isset( $frm_vars['saved_entries'] ) ) {
             $frm_vars['saved_entries'] = array();
         }
         $frm_vars['saved_entries'][] = (int) $entry_id;
 
-        FrmEntryMeta::duplicate_entry_metas($id, $entry_id);
+        FrmEntryMeta::duplicate_entry_metas( $id, $entry_id );
 		self::clear_cache();
 
 		do_action( 'frm_after_duplicate_entry', $entry_id, $new_values['form_id'], array( 'old_id' => $id ) );
@@ -192,7 +192,7 @@ 
 
 		$new_values = self::package_entry_to_update( $id, $values );
 
-		$query_results = $wpdb->update( $wpdb->prefix . 'frm_items', $new_values, compact('id') );
+		$query_results = $wpdb->update( $wpdb->prefix . 'frm_items', $new_values, compact( 'id' ) );
 
 		self::after_update_entry( $query_results, $id, $values, $new_values );
 
@@ -209,7 +209,7 @@ 
             return $result;
         }
 
-        do_action('frm_before_destroy_entry', $id, $entry);
+        do_action( 'frm_before_destroy_entry', $id, $entry );
 
 		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_item_metas WHERE item_id=%d', $id ) );
 		$result = $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_items WHERE id=%d', $id ) );
@@ -221,7 +221,7 @@ 
 
 	public static function update_form( $id, $value, $form_id ) {
         global $wpdb;
-        $form_id = isset($value) ? $form_id : null;
+        $form_id = isset( $value ) ? $form_id : null;
 		$result = $wpdb->update( $wpdb->prefix . 'frm_items', array( 'form_id' => $form_id ), array( 'id' => $id ) );
 		if ( $result ) {
 			self::clear_cache();
@@ -268,24 +268,24 @@ 
         $query = "SELECT it.*, fr.name as form_name, fr.form_key as form_key FROM {$wpdb->prefix}frm_items it
                   LEFT OUTER JOIN {$wpdb->prefix}frm_forms fr ON it.form_id=fr.id WHERE ";
 
-        $query .= is_numeric($id) ? 'it.id=%d' : 'it.item_key=%s';
+        $query .= is_numeric( $id ) ? 'it.id=%d' : 'it.item_key=%s';
         $query_args = array( $id );
         $query = $wpdb->prepare( $query, $query_args );
 
         if ( ! $meta ) {
 			$entry = FrmDb::check_cache( $id . '_nometa', 'frm_entry', $query, 'get_row' );
-            return stripslashes_deep($entry);
+            return stripslashes_deep( $entry );
         }
 
         $entry = FrmDb::check_cache( $id, 'frm_entry' );
         if ( $entry !== false ) {
-            return stripslashes_deep($entry);
+            return stripslashes_deep( $entry );
         }
 
         $entry = $wpdb->get_row( $query );
-        $entry = self::get_meta($entry);
+        $entry = self::get_meta( $entry );
 
-        return stripslashes_deep($entry);
+        return stripslashes_deep( $entry );
     }
 
 	public static function get_meta( $entry ) {
@@ -301,23 +301,23 @@ 
 		$include_key = apply_filters( 'frm_include_meta_keys', false, array( 'form_id' => $entry->form_id ) );
         foreach ( $metas as $meta_val ) {
             if ( $meta_val->item_id == $entry->id ) {
-				$entry->metas[ $meta_val->field_id ] = maybe_unserialize( $meta_val->meta_value );
+				$entry->metas[$meta_val->field_id] = maybe_unserialize( $meta_val->meta_value );
 				if ( $include_key ) {
-					$entry->metas[ $meta_val->field_key ] = $entry->metas[ $meta_val->field_id ];
+					$entry->metas[$meta_val->field_key] = $entry->metas[$meta_val->field_id];
 				}
                  continue;
             }
 
             // include sub entries in an array
-			if ( ! isset( $entry_metas[ $meta_val->field_id ] ) ) {
-				$entry->metas[ $meta_val->field_id ] = array();
+			if ( ! isset( $entry_metas[$meta_val->field_id] ) ) {
+				$entry->metas[$meta_val->field_id] = array();
             }
 
-			$entry->metas[ $meta_val->field_id ][] = maybe_unserialize( $meta_val->meta_value );
+			$entry->metas[$meta_val->field_id][] = maybe_unserialize( $meta_val->meta_value );
 
-            unset($meta_val);
+            unset( $meta_val );
         }
-        unset($metas);
+        unset( $metas );
 
 		FrmDb::set_cache( $entry->id, $entry, 'frm_entry' );
 
@@ -335,24 +335,24 @@ 
             return $exists;
         }
 
-        if ( is_numeric($id) ) {
+        if ( is_numeric( $id ) ) {
             $where = array( 'id' => $id );
         } else {
             $where = array( 'item_key' => $id );
         }
 		$id = FrmDb::get_var( $wpdb->prefix . 'frm_items', $where );
 
-        $exists = ($id && $id > 0) ? true : false;
+        $exists = ( $id && $id > 0 ) ? true : false;
         return $exists;
     }
 
     public static function getAll( $where, $order_by = '', $limit = '', $meta = false, $inc_form = true ) {
 		global $wpdb;
 
-        $limit = FrmDb::esc_limit($limit);
+        $limit = FrmDb::esc_limit( $limit );
 
-        $cache_key = maybe_serialize($where) . $order_by . $limit . $inc_form;
-        $entries = wp_cache_get($cache_key, 'frm_entry');
+        $cache_key = maybe_serialize( $where ) . $order_by . $limit . $inc_form;
+        $entries = wp_cache_get( $cache_key, 'frm_entry' );
 
         if ( false === $entries ) {
             $fields = 'it.id, it.item_key, it.name, it.ip, it.form_id, it.post_id, it.user_id, it.parent_item_id, it.updated_by, it.created_at, it.updated_at, it.is_draft';
@@ -371,25 +371,25 @@ 
 		    }
 
 			// prepare the query
-			$query = 'SELECT ' . $fields . ' FROM ' . $table . FrmDb::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+			$query = 'SELECT ' . $fields . ' FROM ' . $table . FrmDb::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
 
-            $entries = $wpdb->get_results($query, OBJECT_K);
-            unset($query);
+            $entries = $wpdb->get_results( $query, OBJECT_K );
+            unset( $query );
 
 			FrmDb::set_cache( $cache_key, $entries, 'frm_entry' );
         }
 
         if ( ! $meta || ! $entries ) {
-            return stripslashes_deep($entries);
+            return stripslashes_deep( $entries );
         }
-        unset($meta);
+        unset( $meta );
 
-        if ( ! is_array( $where ) && preg_match('/^it\.form_id=\d+$/', $where) ) {
+        if ( ! is_array( $where ) && preg_match( '/^it\.form_id=\d+$/', $where ) ) {
 			$where = array( 'it.form_id' => substr( $where, 11 ) );
         }
 
         $meta_where = array( 'field_id !' => 0 );
-        if ( $limit == '' && is_array($where) && count($where) == 1 && isset($where['it.form_id']) ) {
+        if ( $limit == '' && is_array( $where ) && count( $where ) == 1 && isset( $where['it.form_id'] ) ) {
             $meta_where['fi.form_id'] = $where['it.form_id'];
         } else {
             $meta_where['item_id'] = array_keys( $entries );
@@ -400,21 +400,21 @@ 
         unset( $meta_where );
 
         if ( ! $metas ) {
-            return stripslashes_deep($entries);
+            return stripslashes_deep( $entries );
         }
 
         foreach ( $metas as $m_key => $meta_val ) {
-            if ( ! isset( $entries[ $meta_val->item_id ] ) ) {
+            if ( ! isset( $entries[$meta_val->item_id] ) ) {
                 continue;
             }
 
-            if ( ! isset( $entries[ $meta_val->item_id ]->metas ) ) {
-				$entries[ $meta_val->item_id ]->metas = array();
+            if ( ! isset( $entries[$meta_val->item_id]->metas ) ) {
+				$entries[$meta_val->item_id]->metas = array();
             }
 
-			$entries[ $meta_val->item_id ]->metas[ $meta_val->field_id ] = maybe_unserialize( $meta_val->meta_value );
+			$entries[$meta_val->item_id]->metas[$meta_val->field_id] = maybe_unserialize( $meta_val->meta_value );
 
-            unset($m_key, $meta_val);
+            unset( $m_key, $meta_val );
         }
 
 		if ( ! FrmAppHelper::prevent_caching() ) {
@@ -424,7 +424,7 @@ 
 			}
 		}
 
-        return stripslashes_deep($entries);
+        return stripslashes_deep( $entries );
     }
 
     // Pagination Methods
@@ -432,7 +432,7 @@ 
         global $wpdb;
 		$table_join = $wpdb->prefix . 'frm_items it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fr ON it.form_id=fr.id';
 
-        if ( is_numeric($where) ) {
+        if ( is_numeric( $where ) ) {
             $table_join = 'frm_items';
             $where = array( 'form_id' => $where );
         }
@@ -474,7 +474,7 @@ 
 		self::sanitize_entry_post( $values );
 
 		if ( $type != 'xml' ) {
-			$values = apply_filters('frm_pre_create_entry', $values);
+			$values = apply_filters( 'frm_pre_create_entry', $values );
 		}
 
 		$new_values = self::package_entry_data( $values );
@@ -554,17 +554,17 @@ 
 			'user_id' => self::get_entry_user_id( $values ),
 		);
 
-		if ( is_array($new_values['name']) ) {
-			$new_values['name'] = reset($new_values['name']);
+		if ( is_array( $new_values['name'] ) ) {
+			$new_values['name'] = reset( $new_values['name'] );
 		}
 
-		$new_values['updated_by'] = isset($values['updated_by']) ? $values['updated_by'] : $new_values['user_id'];
+		$new_values['updated_by'] = isset( $values['updated_by'] ) ? $values['updated_by'] : $new_values['user_id'];
 
 		return $new_values;
 	}
 
 	private static function get_entry_value( $values, $name, $default ) {
-		return isset( $values[ $name ] ) ? $values[ $name ] : $default;
+		return isset( $values[$name] ) ? $values[$name] : $default;
 	}
 
 	/**
@@ -581,7 +581,7 @@ 
 		}
 
 		$ip = FrmAppHelper::get_ip_address();
-		if ( defined('WP_IMPORTING') && WP_IMPORTING ) {
+		if ( defined( 'WP_IMPORTING' ) && WP_IMPORTING ) {
 			$ip = self::get_entry_value( $values, 'ip', $ip );
 		}
 		return $ip;
@@ -694,7 +694,7 @@ 
 	private static function add_new_entry_to_frm_vars( $entry_id ) {
 		global $frm_vars;
 
-		if ( ! isset($frm_vars['saved_entries']) ) {
+		if ( ! isset( $frm_vars['saved_entries'] ) ) {
 			$frm_vars['saved_entries'] = array();
 		}
 
@@ -709,7 +709,7 @@ 
 	* @param int $entry_id
 	*/
 	private static function maybe_add_entry_metas( $values, $entry_id ) {
-		if ( isset($values['item_meta']) ) {
+		if ( isset( $values['item_meta'] ) ) {
 			FrmEntryMeta::update_entry_metas( $entry_id, $values['item_meta'] );
 		}
 	}
@@ -726,7 +726,7 @@ 
 		$is_child = isset( $values['parent_form_id'] ) && isset( $values['parent_nonce'] ) && ! empty( $values['parent_form_id'] ) && wp_verify_nonce( $values['parent_nonce'], 'parent' );
 
 		do_action( 'frm_after_create_entry', $entry_id, $new_values['form_id'], compact( 'is_child' ) );
-		do_action( 'frm_after_create_entry_' . $new_values['form_id'], $entry_id , compact( 'is_child' ) );
+		do_action( 'frm_after_create_entry_' . $new_values['form_id'], $entry_id, compact( 'is_child' ) );
 	}
 
 	/**
@@ -767,7 +767,7 @@ 
 		}
 
 		if ( $update && $update_type != 'xml' ) {
-			$values = apply_filters('frm_pre_update_entry', $values, $id);
+			$values = apply_filters( 'frm_pre_update_entry', $values, $id );
 		}
 
 		return $update;
@@ -788,27 +788,27 @@ 
 			'name'      => self::get_new_entry_name( $values ),
 			'form_id'   => (int) self::get_entry_value( $values, 'form_id', null ),
 			'is_draft'  => self::get_is_draft_value( $values ),
-			'updated_at' => current_time('mysql', 1),
-			'updated_by' => isset($values['updated_by']) ? $values['updated_by'] : get_current_user_id(),
+			'updated_at' => current_time( 'mysql', 1 ),
+			'updated_by' => isset( $values['updated_by'] ) ? $values['updated_by'] : get_current_user_id(),
 		);
 
-		if ( isset($values['post_id']) ) {
+		if ( isset( $values['post_id'] ) ) {
 			$new_values['post_id'] = (int) $values['post_id'];
 		}
 
-		if ( isset($values['item_key']) ) {
+		if ( isset( $values['item_key'] ) ) {
 			$new_values['item_key'] = FrmAppHelper::get_unique_key( $values['item_key'], $wpdb->prefix . 'frm_items', 'item_key', $id );
 		}
 
-		if ( isset($values['parent_item_id']) ) {
+		if ( isset( $values['parent_item_id'] ) ) {
 			$new_values['parent_item_id'] = (int) $values['parent_item_id'];
 		}
 
-		if ( isset($values['frm_user_id']) && is_numeric($values['frm_user_id']) ) {
+		if ( isset( $values['frm_user_id'] ) && is_numeric( $values['frm_user_id'] ) ) {
 			$new_values['user_id'] = $values['frm_user_id'];
 		}
 
-		$new_values = apply_filters('frm_update_entry', $new_values, $id);
+		$new_values = apply_filters( 'frm_update_entry', $new_values, $id );
 
 		return $new_values;
 	}

classes/models/FrmDb.php

Indentation +229 added lines, -229 removed lines

@@ -1,36 +1,36 @@ 
 <?php
 
 class FrmDb {
-    public $fields;
-    public $forms;
-    public $entries;
-    public $entry_metas;
-
-    public function __construct() {
-        if ( ! defined('ABSPATH') ) {
-            die('You are not allowed to call this page directly.');
-        }
+	public $fields;
+	public $forms;
+	public $entries;
+	public $entry_metas;
+
+	public function __construct() {
+		if ( ! defined('ABSPATH') ) {
+			die('You are not allowed to call this page directly.');
+		}
 
 		_deprecated_function( __METHOD__, '2.06', 'FrmMigrate' );
-        global $wpdb;
-        $this->fields         = $wpdb->prefix . 'frm_fields';
-        $this->forms          = $wpdb->prefix . 'frm_forms';
-        $this->entries        = $wpdb->prefix . 'frm_items';
-        $this->entry_metas    = $wpdb->prefix . 'frm_item_metas';
-    }
-
-    /**
-     * Change array into format $wpdb->prepare can use
+		global $wpdb;
+		$this->fields         = $wpdb->prefix . 'frm_fields';
+		$this->forms          = $wpdb->prefix . 'frm_forms';
+		$this->entries        = $wpdb->prefix . 'frm_items';
+		$this->entry_metas    = $wpdb->prefix . 'frm_item_metas';
+	}
+
+	/**
+	 * Change array into format $wpdb->prepare can use
 	 *
 	 * @param array $args
 	 * @param string $starts_with
-     */
-    public static function get_where_clause_and_values( &$args, $starts_with = ' WHERE ' ) {
-        if ( empty($args) ) {
+	 */
+	public static function get_where_clause_and_values( &$args, $starts_with = ' WHERE ' ) {
+		if ( empty($args) ) {
 			// add an arg to prevent prepare from failing
 			$args = array( 'where' => $starts_with . '1=%d', 'values' => array( 1 ) );
 			return;
-        }
+		}
 
 		$where = '';
 		$values = array();
@@ -41,64 +41,64 @@ 
 		}
 
 		$args = compact( 'where', 'values' );
-    }
+	}
 
-    /**
+	/**
 	 * @param array $args
-     * @param string $base_where
-     * @param string $where
+	 * @param string $base_where
+	 * @param string $where
 	 * @param array $values
-     */
-    public static function parse_where_from_array( $args, $base_where, &$where, &$values ) {
-        $condition = ' AND';
-        if ( isset( $args['or'] ) ) {
-            $condition = ' OR';
-            unset( $args['or'] );
-        }
-
-        foreach ( $args as $key => $value ) {
-            $where .= empty( $where ) ? $base_where : $condition;
-            $array_inc_null = ( ! is_numeric( $key ) && is_array( $value ) && in_array( null, $value ) );
-            if ( is_numeric( $key ) || $array_inc_null ) {
-                $where .= ' ( ';
-                $nested_where = '';
-                if ( $array_inc_null ) {
-                    foreach ( $value as $val ) {
-                        self::parse_where_from_array( array( $key => $val, 'or' => 1 ), '', $nested_where, $values );
-                    }
-                } else {
-                    self::parse_where_from_array( $value, '', $nested_where, $values );
-                }
-                $where .= $nested_where;
-                $where .= ' ) ';
-            } else {
-                self::interpret_array_to_sql( $key, $value, $where, $values );
-            }
-        }
-    }
-
-    /**
-     * @param string $key
+	 */
+	public static function parse_where_from_array( $args, $base_where, &$where, &$values ) {
+		$condition = ' AND';
+		if ( isset( $args['or'] ) ) {
+			$condition = ' OR';
+			unset( $args['or'] );
+		}
+
+		foreach ( $args as $key => $value ) {
+			$where .= empty( $where ) ? $base_where : $condition;
+			$array_inc_null = ( ! is_numeric( $key ) && is_array( $value ) && in_array( null, $value ) );
+			if ( is_numeric( $key ) || $array_inc_null ) {
+				$where .= ' ( ';
+				$nested_where = '';
+				if ( $array_inc_null ) {
+					foreach ( $value as $val ) {
+						self::parse_where_from_array( array( $key => $val, 'or' => 1 ), '', $nested_where, $values );
+					}
+				} else {
+					self::parse_where_from_array( $value, '', $nested_where, $values );
+				}
+				$where .= $nested_where;
+				$where .= ' ) ';
+			} else {
+				self::interpret_array_to_sql( $key, $value, $where, $values );
+			}
+		}
+	}
+
+	/**
+	 * @param string $key
 	 * @param string|array $value
-     * @param string $where
+	 * @param string $where
 	 * @param array $values
-     */
-    private static function interpret_array_to_sql( $key, $value, &$where, &$values ) {
+	 */
+	private static function interpret_array_to_sql( $key, $value, &$where, &$values ) {
 		$key = trim( $key );
 
 		if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false ) {
-            $k = explode(' ', $key);
-            $where .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key );
-            $values[] = '%Y-%m-%d %H:%i:%s';
-        } else {
+			$k = explode(' ', $key);
+			$where .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key );
+			$values[] = '%Y-%m-%d %H:%i:%s';
+		} else {
 			$where .= ' ' . $key;
-        }
+		}
 
 		$lowercase_key = explode( ' ', strtolower( $key ) );
 		$lowercase_key = end( $lowercase_key );
 
-        if ( is_array( $value ) ) {
-            // translate array of values to "in"
+		if ( is_array( $value ) ) {
+			// translate array of values to "in"
 			if ( strpos( $lowercase_key, 'like' ) !== false ) {
 				$where = preg_replace('/' . $key . '$/', '', $where);
 				$where .= '(';
@@ -116,7 +116,7 @@ 
 				$where .= ' in (' . self::prepare_array_values( $value, '%s' ) . ')';
 				$values = array_merge( $values, $value );
 			}
-        } else if ( strpos( $lowercase_key, 'like' ) !== false ) {
+		} else if ( strpos( $lowercase_key, 'like' ) !== false ) {
 			/**
 			 * Allow string to start or end with the value
 			 * If the key is like% then skip the first % for starts with
@@ -136,9 +136,9 @@ 
 			$where .= ' %s';
 			$values[] = $start . self::esc_like( $value ) . $end;
 
-        } else if ( $value === null ) {
-            $where .= ' IS NULL';
-        } else {
+		} else if ( $value === null ) {
+			$where .= ' IS NULL';
+		} else {
 			// allow a - to prevent = from being added
 			if ( substr( $key, -1 ) == '-' ) {
 				$where = rtrim( $where, '-' );
@@ -148,9 +148,9 @@ 
 
 			self::add_query_placeholder( $key, $value, $where );
 
-            $values[] = $value;
-        }
-    }
+			$values[] = $value;
+		}
+	}
 
 	/**
 	 * Add %d, or %s to query
@@ -160,7 +160,7 @@ 
 	 * @param int|string $value
 	 * @param string $where
 	 */
-    private static function add_query_placeholder( $key, $value, &$where ) {
+	private static function add_query_placeholder( $key, $value, &$where ) {
 		if ( is_numeric( $value ) && ( strpos( $key, 'meta_value' ) === false || strpos( $key, '+0' ) !== false ) ) {
 			$where .= '%d';
 		} else {
@@ -168,16 +168,16 @@ 
 		}
 	}
 
-    /**
-     * @param string $table
+	/**
+	 * @param string $table
 	 * @param array $where
 	 * @param array $args
 	 * @return int
-     */
-    public static function get_count( $table, $where = array(), $args = array() ) {
-        $count = self::get_var( $table, $where, 'COUNT(*)', $args );
-        return $count;
-    }
+	 */
+	public static function get_count( $table, $where = array(), $args = array() ) {
+		$count = self::get_var( $table, $where, 'COUNT(*)', $args );
+		return $count;
+	}
 
 	/**
 	 * @param string $table
@@ -188,17 +188,17 @@ 
 	 * @param string $type
 	 * @return array|null|string|object
 	 */
-    public static function get_var( $table, $where = array(), $field = 'id', $args = array(), $limit = '', $type = 'var' ) {
-        $group = '';
-        self::get_group_and_table_name( $table, $group );
+	public static function get_var( $table, $where = array(), $field = 'id', $args = array(), $limit = '', $type = 'var' ) {
+		$group = '';
+		self::get_group_and_table_name( $table, $group );
 		self::convert_options_to_array( $args, '', $limit );
 
 		$query = self::generate_query_string_from_pieces( $field, $table, $where, $args );
 
 		$cache_key = self::generate_cache_key( $where, $args, $field, $type );
 		$results = self::check_cache( $cache_key, $group, $query, 'get_' . $type );
-        return $results;
-    }
+		return $results;
+	}
 
 	/**
 	 * Generate a cache key from the where query, field, type, and other arguments
@@ -224,44 +224,44 @@ 
 		return $cache_key;
 	}
 
-    /**
-     * @param string $table
-     * @param array $where
+	/**
+	 * @param string $table
+	 * @param array $where
 	 * @param string $field
 	 * @param array $args
 	 * @param string $limit
 	 * @return mixed
-     */
-    public static function get_col( $table, $where = array(), $field = 'id', $args = array(), $limit = '' ) {
-        return self::get_var( $table, $where, $field, $args, $limit, 'col' );
-    }
-
-    /**
-     * @since 2.0
-     * @param string $table
+	 */
+	public static function get_col( $table, $where = array(), $field = 'id', $args = array(), $limit = '' ) {
+		return self::get_var( $table, $where, $field, $args, $limit, 'col' );
+	}
+
+	/**
+	 * @since 2.0
+	 * @param string $table
 	 * @param array $where
 	 * @param string $fields
 	 * @param array $args
 	 * @return mixed
-     */
-    public static function get_row( $table, $where = array(), $fields = '*', $args = array() ) {
-        $args['limit'] = 1;
-        return self::get_var( $table, $where, $fields, $args, '', 'row' );
-    }
-
-    /**
-     * Prepare a key/value array before DB call
+	 */
+	public static function get_row( $table, $where = array(), $fields = '*', $args = array() ) {
+		$args['limit'] = 1;
+		return self::get_var( $table, $where, $fields, $args, '', 'row' );
+	}
+
+	/**
+	 * Prepare a key/value array before DB call
 	 *
-     * @since 2.0
-     * @param string $table
+	 * @since 2.0
+	 * @param string $table
 	 * @param array $where
 	 * @param string $fields
 	 * @param array $args
 	 * @return mixed
-     */
-    public static function get_results( $table, $where = array(), $fields = '*', $args = array() ) {
-        return self::get_var( $table, $where, $fields, $args, '', 'results' );
-    }
+	 */
+	public static function get_results( $table, $where = array(), $fields = '*', $args = array() ) {
+		return self::get_var( $table, $where, $fields, $args, '', 'results' );
+	}
 
 	/**
 	 * Check for like, not like, in, not in, =, !=, >, <, <=, >=
@@ -298,59 +298,59 @@ 
 		return '';
 	}
 
-    /**
-     * Get 'frm_forms' from wp_frm_forms or a longer table param that includes a join
-     * Also add the wpdb->prefix to the table if it's missing
-     *
-     * @param string $table
-     * @param string $group
-     */
-    private static function get_group_and_table_name( &$table, &$group ) {
+	/**
+	 * Get 'frm_forms' from wp_frm_forms or a longer table param that includes a join
+	 * Also add the wpdb->prefix to the table if it's missing
+	 *
+	 * @param string $table
+	 * @param string $group
+	 */
+	private static function get_group_and_table_name( &$table, &$group ) {
 		global $wpdb, $wpmuBaseTablePrefix;
 
-        $table_parts = explode(' ', $table);
-        $group = reset($table_parts);
-        $group = str_replace( $wpdb->prefix, '', $group );
+		$table_parts = explode(' ', $table);
+		$group = reset($table_parts);
+		$group = str_replace( $wpdb->prefix, '', $group );
 
 		$prefix = $wpmuBaseTablePrefix ? $wpmuBaseTablePrefix : $wpdb->base_prefix;
 		$group = str_replace( $prefix, '', $group );
 
-        if ( $group == $table ) {
-            $table = $wpdb->prefix . $table;
-        }
+		if ( $group == $table ) {
+			$table = $wpdb->prefix . $table;
+		}
 
 		// switch to singular group name
 		$group = rtrim( $group, 's' );
-    }
+	}
 
-    private static function convert_options_to_array( &$args, $order_by = '', $limit = '' ) {
-        if ( ! is_array($args) ) {
+	private static function convert_options_to_array( &$args, $order_by = '', $limit = '' ) {
+		if ( ! is_array($args) ) {
 			$args = array( 'order_by' => $args );
-        }
+		}
 
-        if ( ! empty( $order_by ) ) {
-            $args['order_by'] = $order_by;
-        }
+		if ( ! empty( $order_by ) ) {
+			$args['order_by'] = $order_by;
+		}
 
-        if ( ! empty( $limit ) ) {
-            $args['limit'] = $limit;
-        }
+		if ( ! empty( $limit ) ) {
+			$args['limit'] = $limit;
+		}
 
-        $temp_args = $args;
-        foreach ( $temp_args as $k => $v ) {
-            if ( $v == '' ) {
+		$temp_args = $args;
+		foreach ( $temp_args as $k => $v ) {
+			if ( $v == '' ) {
 				unset( $args[ $k ] );
-                continue;
-            }
+				continue;
+			}
 
-            if ( $k == 'limit' ) {
+			if ( $k == 'limit' ) {
 				$args[ $k ] = self::esc_limit( $v );
-            }
-            $db_name = strtoupper( str_replace( '_', ' ', $k ) );
-            if ( strpos( $v, $db_name ) === false ) {
+			}
+			$db_name = strtoupper( str_replace( '_', ' ', $k ) );
+			if ( strpos( $v, $db_name ) === false ) {
 				$args[ $k ] = $db_name . ' ' . $v;
-            }
-        }
+			}
+		}
 
 		// Make sure LIMIT is the last argument
 		if ( isset( $args['order_by'] ) && isset( $args['limit'] ) ) {
@@ -358,7 +358,7 @@ 
 			unset( $args['limit'] );
 			$args['limit'] = $temp_limit;
 		}
-    }
+	}
 
 	/**
 	 * Get the associative array results for the given columns, table, and where query
@@ -411,62 +411,62 @@ 
 		return $query;
 	}
 
-    /**
-     * Added for < WP 4.0 compatability
-     *
-     * @since 2.06
-     *
-     * @param string $term The value to escape
-     * @return string The escaped value
-     */
+	/**
+	 * Added for < WP 4.0 compatability
+	 *
+	 * @since 2.06
+	 *
+	 * @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;
+	}
 
-    /**
+	/**
 	 * @since 2.06
-     * @param string $order_query
-     */
+	 * @param string $order_query
+	 */
 	public static function esc_order( $order_query ) {
-        if ( empty( $order_query ) ) {
-            return '';
-        }
-
-        // remove ORDER BY before santizing
-        $order_query = strtolower( $order_query );
-        if ( strpos( $order_query, 'order by' ) !== false ) {
-            $order_query = str_replace( 'order by', '', $order_query );
-        }
-
-        $order_query = explode( ' ', trim( $order_query ) );
-
-        $order_fields = array(
-            'id', 'form_key', 'name', 'description',
-            'parent_form_id', 'logged_in', 'is_template',
-            'default_template', 'status', 'created_at',
-        );
-
-        $order = trim( trim( reset( $order_query ), ',' ) );
-        if ( ! in_array( $order, $order_fields ) ) {
-            return '';
-        }
-
-        $order_by = '';
-        if ( count( $order_query ) > 1 ) {
+		if ( empty( $order_query ) ) {
+			return '';
+		}
+
+		// remove ORDER BY before santizing
+		$order_query = strtolower( $order_query );
+		if ( strpos( $order_query, 'order by' ) !== false ) {
+			$order_query = str_replace( 'order by', '', $order_query );
+		}
+
+		$order_query = explode( ' ', trim( $order_query ) );
+
+		$order_fields = array(
+			'id', 'form_key', 'name', 'description',
+			'parent_form_id', 'logged_in', 'is_template',
+			'default_template', 'status', 'created_at',
+		);
+
+		$order = trim( trim( reset( $order_query ), ',' ) );
+		if ( ! in_array( $order, $order_fields ) ) {
+			return '';
+		}
+
+		$order_by = '';
+		if ( count( $order_query ) > 1 ) {
 			$order_by = end( $order_query );
 			self::esc_order_by( $order_by );
-        }
+		}
 
 		return ' ORDER BY ' . $order . ' ' . $order_by;
-    }
+	}
 
 	/**
 	 * Make sure this is ordering by either ASC or DESC
@@ -504,18 +504,18 @@ 
 		return ' LIMIT ' . $limit;
 	}
 
-    /**
-     * Get an array of values ready to go through $wpdb->prepare
-     * @since 2.06
-     */
+	/**
+	 * Get an array of values ready to go through $wpdb->prepare
+	 * @since 2.06
+	 */
 	public static function prepare_array_values( $array, $type = '%s' ) {
 		$placeholders = array_fill( 0, count( $array ), $type );
 		return implode( ', ', $placeholders );
 	}
 
-    /**
-     * @since 2.06
-     */
+	/**
+	 * @since 2.06
+	 */
 	public static function prepend_and_or_where( $starts_with = ' WHERE ', $where = '' ) {
 		if ( empty( $where ) ) {
 			return '';
@@ -578,17 +578,17 @@ 
 		return $post;
 	}
 
-    /**
-     * Check cache before fetching values and saving to cache
-     *
-     * @since 2.06
-     *
-     * @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
-     */
+	/**
+	 * Check cache before fetching values and saving to cache
+	 *
+	 * @since 2.06
+	 *
+	 * @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 ( ! FrmAppHelper::is_empty_value( $results, false ) || empty( $query ) ) {
@@ -643,13 +643,13 @@ 
 		return $cached;
 	}
 
-    /**
-     * Data that should be stored for a long time can be stored in a transient.
-     * First check the cache, then check the transient
+	/**
+	 * 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.06
-     * @return mixed The cached value or false
-     */
+	 * @since 2.06
+	 * @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 );
@@ -666,22 +666,22 @@ 
 		return $results;
 	}
 
-    /**
-     * @since 2.06
-     * @param string $cache_key
-     */
+	/**
+	 * @since 2.06
+	 * @param string $cache_key
+	 */
 	public static function delete_cache_and_transient( $cache_key, $group = 'default' ) {
 		delete_transient( $cache_key );
 		wp_cache_delete( $cache_key, $group );
 	}
 
-    /**
-     * Delete all caching in a single group
-     *
-     * @since 2.06
-     *
-     * @param string $group The name of the cache group
-     */
+	/**
+	 * Delete all caching in a single group
+	 *
+	 * @since 2.06
+	 *
+	 * @param string $group The name of the cache group
+	 */
 	public static function cache_delete_group( $group ) {
 		$cached_keys = self::get_group_cached_keys( $group );
 

Spacing +16 added lines, -16 removed lines

@@ -7,8 +7,8 @@ 
     public $entry_metas;
 
     public function __construct() {
-        if ( ! defined('ABSPATH') ) {
-            die('You are not allowed to call this page directly.');
+        if ( ! defined( 'ABSPATH' ) ) {
+            die( 'You are not allowed to call this page directly.' );
         }
 
 		_deprecated_function( __METHOD__, '2.06', 'FrmMigrate' );
@@ -26,7 +26,7 @@ 
 	 * @param string $starts_with
      */
     public static function get_where_clause_and_values( &$args, $starts_with = ' WHERE ' ) {
-        if ( empty($args) ) {
+        if ( empty( $args ) ) {
 			// add an arg to prevent prepare from failing
 			$args = array( 'where' => $starts_with . '1=%d', 'values' => array( 1 ) );
 			return;
@@ -87,7 +87,7 @@ 
 		$key = trim( $key );
 
 		if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false ) {
-            $k = explode(' ', $key);
+            $k = explode( ' ', $key );
             $where .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key );
             $values[] = '%Y-%m-%d %H:%i:%s';
         } else {
@@ -100,7 +100,7 @@ 
         if ( is_array( $value ) ) {
             // translate array of values to "in"
 			if ( strpos( $lowercase_key, 'like' ) !== false ) {
-				$where = preg_replace('/' . $key . '$/', '', $where);
+				$where = preg_replace( '/' . $key . '$/', '', $where );
 				$where .= '(';
 				$start = true;
 				foreach ( $value as $v ) {
@@ -285,8 +285,8 @@ 
 		);
 
 		$where_is = strtolower( $where_is );
-		if ( isset( $switch_to[ $where_is ] ) ) {
-			return ' ' . $switch_to[ $where_is ];
+		if ( isset( $switch_to[$where_is] ) ) {
+			return ' ' . $switch_to[$where_is];
 		}
 
 		// > and < need a little more work since we don't want them switched to >= and <=
@@ -308,8 +308,8 @@ 
     private static function get_group_and_table_name( &$table, &$group ) {
 		global $wpdb, $wpmuBaseTablePrefix;
 
-        $table_parts = explode(' ', $table);
-        $group = reset($table_parts);
+        $table_parts = explode( ' ', $table );
+        $group = reset( $table_parts );
         $group = str_replace( $wpdb->prefix, '', $group );
 
 		$prefix = $wpmuBaseTablePrefix ? $wpmuBaseTablePrefix : $wpdb->base_prefix;
@@ -324,7 +324,7 @@ 
     }
 
     private static function convert_options_to_array( &$args, $order_by = '', $limit = '' ) {
-        if ( ! is_array($args) ) {
+        if ( ! is_array( $args ) ) {
 			$args = array( 'order_by' => $args );
         }
 
@@ -339,16 +339,16 @@ 
         $temp_args = $args;
         foreach ( $temp_args as $k => $v ) {
             if ( $v == '' ) {
-				unset( $args[ $k ] );
+				unset( $args[$k] );
                 continue;
             }
 
             if ( $k == 'limit' ) {
-				$args[ $k ] = self::esc_limit( $v );
+				$args[$k] = self::esc_limit( $v );
             }
             $db_name = strtoupper( str_replace( '_', ' ', $k ) );
             if ( strpos( $v, $db_name ) === false ) {
-				$args[ $k ] = $db_name . ' ' . $v;
+				$args[$k] = $db_name . ' ' . $v;
             }
         }
 
@@ -375,7 +375,7 @@ 
 
 		$query = self::generate_query_string_from_pieces( $columns, $table, $where );
 
-		$cache_key = str_replace( array( ' ', ',' ), '_', trim( implode( '_', FrmAppHelper::array_flatten( $where ) ) . $columns . '_results_ARRAY_A' , ' WHERE' ) );
+		$cache_key = str_replace( array( ' ', ',' ), '_', trim( implode( '_', FrmAppHelper::array_flatten( $where ) ) . $columns . '_results_ARRAY_A', ' WHERE' ) );
 		$results = self::check_cache( $cache_key, $group, $query, 'get_associative_results' );
 
 		return $results;
@@ -496,7 +496,7 @@ 
 		$limit = explode( ',', trim( $limit ) );
 		foreach ( $limit as $k => $l ) {
 			if ( is_numeric( $l ) ) {
-				$limit[ $k ] = $l;
+				$limit[$k] = $l;
 			}
 		}
 
@@ -627,7 +627,7 @@ 
 	 */
 	public static function add_key_to_group_cache( $key, $group ) {
 		$cached = self::get_group_cached_keys( $group );
-		$cached[ $key ] = $key;
+		$cached[$key] = $key;
 		wp_cache_set( 'cached_keys', $cached, $group, 300 );
 	}
 

classes/models/FrmField.php

Indentation +193 added lines, -193 removed lines

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

Spacing +68 added lines, -68 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -9,7 +9,7 @@ 
 	static $transient_size = 200;
 
 	public static function field_selection() {
-		$fields = apply_filters('frm_available_fields', array(
+		$fields = apply_filters( 'frm_available_fields', array(
 			'text'      => __( 'Single Line Text', 'formidable' ),
 			'textarea'  => __( 'Paragraph Text', 'formidable' ),
 			'checkbox'  => __( 'Checkboxes', 'formidable' ),
@@ -18,13 +18,13 @@ 
 			'email'     => __( 'Email Address', 'formidable' ),
 			'url'       => __( 'Website/URL', 'formidable' ),
 			'captcha'   => __( 'reCAPTCHA', 'formidable' ),
-		));
+		) );
 
 		return $fields;
 	}
 
 	public static function pro_field_selection() {
-		return apply_filters('frm_pro_available_fields', array(
+		return apply_filters( 'frm_pro_available_fields', array(
 			'end_divider' => array(
 				'name'  => __( 'End Section', 'formidable' ),
 				'switch_from' => 'divider',
@@ -49,36 +49,36 @@ 
 			'tag'       => __( 'Tags', 'formidable' ),
 			'credit_card' => __( 'Credit Card', 'formidable' ),
 			'address'   => __( 'Address', 'formidable' ),
-		));
+		) );
 	}
 
     public static function create( $values, $return = true ) {
         global $wpdb, $frm_duplicate_ids;
 
         $new_values = array();
-        $key = isset($values['field_key']) ? $values['field_key'] : $values['name'];
+        $key = isset( $values['field_key'] ) ? $values['field_key'] : $values['name'];
 		$new_values['field_key'] = FrmAppHelper::get_unique_key( $key, $wpdb->prefix . 'frm_fields', 'field_key' );
 
 		foreach ( array( 'name', 'description', 'type', 'default_value' ) as $col ) {
-			$new_values[ $col ] = $values[ $col ];
+			$new_values[$col] = $values[$col];
         }
 
         $new_values['options'] = $values['options'];
 
-        $new_values['field_order'] = isset($values['field_order']) ? (int) $values['field_order'] : null;
-        $new_values['required'] = isset($values['required']) ? (int) $values['required'] : 0;
-        $new_values['form_id'] = isset($values['form_id']) ? (int) $values['form_id'] : null;
+        $new_values['field_order'] = isset( $values['field_order'] ) ? (int) $values['field_order'] : null;
+        $new_values['required'] = isset( $values['required'] ) ? (int) $values['required'] : 0;
+        $new_values['form_id'] = isset( $values['form_id'] ) ? (int) $values['form_id'] : null;
         $new_values['field_options'] = $values['field_options'];
-        $new_values['created_at'] = current_time('mysql', 1);
+        $new_values['created_at'] = current_time( 'mysql', 1 );
 
 		if ( isset( $values['id'] ) ) {
-			$frm_duplicate_ids[ $values['field_key'] ] = $new_values['field_key'];
-            $new_values = apply_filters('frm_duplicated_field', $new_values);
+			$frm_duplicate_ids[$values['field_key']] = $new_values['field_key'];
+            $new_values = apply_filters( 'frm_duplicated_field', $new_values );
         }
 
 		foreach ( $new_values as $k => $v ) {
             if ( is_array( $v ) ) {
-				$new_values[ $k ] = serialize( $v );
+				$new_values[$k] = serialize( $v );
 			}
             unset( $k, $v );
         }
@@ -99,7 +99,7 @@ 
 
 		if ( $query_results ) {
 			if ( isset( $values['id'] ) ) {
-				$frm_duplicate_ids[ $values['id'] ] = $new_id;
+				$frm_duplicate_ids[$values['id']] = $new_id;
 			}
 			return $new_id;
 		} else {
@@ -114,9 +114,9 @@ 
 		$fields = self::getAll( $where, 'field_order', '', $blog_id );
 
         foreach ( (array) $fields as $field ) {
-            $new_key = ($copy_keys) ? $field->field_key : '';
-            if ( $copy_keys && substr($field->field_key, -1) == 2 ) {
-                $new_key = rtrim($new_key, 2);
+            $new_key = ( $copy_keys ) ? $field->field_key : '';
+            if ( $copy_keys && substr( $field->field_key, -1 ) == 2 ) {
+                $new_key = rtrim( $new_key, 2 );
             }
 
             $values = array();
@@ -139,11 +139,11 @@ 
 				$values['form_id'] = $new_repeat_form_id;
 			}
 
-            $values = apply_filters('frm_duplicated_field', $values);
-            $new_id = self::create($values);
-            $frm_duplicate_ids[ $field->id ] = $new_id;
-            $frm_duplicate_ids[ $field->field_key ] = $new_id;
-            unset($field);
+            $values = apply_filters( 'frm_duplicated_field', $values );
+            $new_id = self::create( $values );
+            $frm_duplicate_ids[$field->id] = $new_id;
+            $frm_duplicate_ids[$field->field_key] = $new_id;
+            unset( $field );
         }
     }
 
@@ -156,7 +156,7 @@ 
 			$values['field_key'] = FrmAppHelper::get_unique_key( $values['field_key'], $wpdb->prefix . 'frm_fields', 'field_key', $id );
 		}
 
-        if ( isset($values['required']) ) {
+        if ( isset( $values['required'] ) ) {
             $values['required'] = (int) $values['required'];
         }
 
@@ -173,8 +173,8 @@ 
 
 		// serialize array values
 		foreach ( array( 'default_value', 'field_options', 'options' ) as $opt ) {
-			if ( isset( $values[ $opt ] ) && is_array( $values[ $opt ] ) ) {
-				$values[ $opt ] = serialize( $values[ $opt ] );
+			if ( isset( $values[$opt] ) && is_array( $values[$opt] ) ) {
+				$values[$opt] = serialize( $values[$opt] );
 			}
 		}
 
@@ -184,13 +184,13 @@ 
 		if ( isset( $values['form_id'] ) ) {
             $form_id = absint( $values['form_id'] );
 		} else {
-            $field = self::getOne($id);
+            $field = self::getOne( $id );
             if ( $field ) {
                 $form_id = $field->form_id;
             }
-            unset($field);
+            unset( $field );
         }
-        unset($values);
+        unset( $values );
 
 		if ( $query_results ) {
             wp_cache_delete( $id, 'frm_field' );
@@ -243,7 +243,7 @@ 
 
 		FrmDb::cache_delete_group( 'frm_field' );
 
-        $form = FrmForm::getOne($form_id);
+        $form = FrmForm::getOne( $form_id );
         if ( $form && $form->parent_form_id && $form->parent_form_id != $form_id ) {
             self::delete_form_transient( $form->parent_form_id );
         }
@@ -265,16 +265,16 @@ 
 
         global $wpdb;
 
-        $where = is_numeric($id) ? 'id=%d' : 'field_key=%s';
+        $where = is_numeric( $id ) ? 'id=%d' : 'field_key=%s';
 		$query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->prefix . 'frm_fields WHERE ' . $where, $id );
 
         $results = FrmDb::check_cache( $id, 'frm_field', $query, 'get_row', 0 );
 
-        if ( empty($results) ) {
+        if ( empty( $results ) ) {
             return $results;
         }
 
-        if ( is_numeric($id) ) {
+        if ( is_numeric( $id ) ) {
 			FrmDb::set_cache( $results->field_key, $results, 'frm_field' );
         } else if ( $results ) {
 			FrmDb::set_cache( $results->id, $results, 'frm_field' );
@@ -282,7 +282,7 @@ 
 
 		self::prepare_options( $results );
 
-        return stripslashes_deep($results);
+        return stripslashes_deep( $results );
     }
 
     /**
@@ -315,20 +315,20 @@ 
                     continue;
                 }
 
-				$fields[ $result->id ] = $result;
-                $count++;
+				$fields[$result->id] = $result;
+                $count ++;
                 if ( $limit == 1 ) {
                     $fields = $result;
                     break;
                 }
 
-                if ( ! empty($limit) && $count >= $limit ) {
+                if ( ! empty( $limit ) && $count >= $limit ) {
                     break;
                 }
 
-                unset($result);
+                unset( $result );
             }
-            return stripslashes_deep($fields);
+            return stripslashes_deep( $fields );
         }
 
         self::$use_cache = false;
@@ -337,7 +337,7 @@ 
 		self::maybe_include_repeating_fields( $inc_sub, $where );
 		$results = self::getAll( $where, 'field_order', $limit );
         self::$use_cache = true;
-        self::include_sub_fields($results, $inc_sub, $type);
+        self::include_sub_fields( $results, $inc_sub, $type );
 
         return $results;
     }
@@ -349,15 +349,15 @@ 
 
 		$results = self::get_fields_from_transients( $form_id, array( 'inc_embed' => $inc_embed, 'inc_repeat' => $inc_repeat ) );
 		if ( ! empty( $results ) ) {
-            if ( empty($limit) ) {
+            if ( empty( $limit ) ) {
 				return $results;
             }
 
             $fields = array();
             $count = 0;
             foreach ( $results as $result ) {
-				$fields[ $result->id ] = $result;
-                if ( ! empty($limit) && $count >= $limit ) {
+				$fields[$result->id] = $result;
+                if ( ! empty( $limit ) && $count >= $limit ) {
                     break;
                 }
             }
@@ -375,7 +375,7 @@ 
 
 		self::include_sub_fields( $results, $inc_embed, 'all' );
 
-        if ( empty($limit) ) {
+        if ( empty( $limit ) ) {
 			self::set_field_transient( $results, $form_id, 0, array( 'inc_embed' => $inc_embed, 'inc_repeat' => $inc_repeat ) );
         }
 
@@ -404,22 +404,22 @@ 
         $form_fields = $results;
 		$index_offset = 1;
         foreach ( $form_fields as $k => $field ) {
-            if ( 'form' != $field->type || ! isset($field->field_options['form_select']) ) {
+            if ( 'form' != $field->type || ! isset( $field->field_options['form_select'] ) ) {
                 continue;
             }
 
             if ( $type == 'all' ) {
                 $sub_fields = self::get_all_for_form( $field->field_options['form_select'] );
             } else {
-                $sub_fields = self::get_all_types_in_form($field->form_id, $type);
+                $sub_fields = self::get_all_types_in_form( $field->form_id, $type );
             }
 
-            if ( ! empty($sub_fields) ) {
+            if ( ! empty( $sub_fields ) ) {
 				$index = $k + $index_offset;
 				$index_offset += count( $sub_fields );
-				array_splice($results, $index, 0, $sub_fields);
+				array_splice( $results, $index, 0, $sub_fields );
             }
-            unset($field, $sub_fields);
+            unset( $field, $sub_fields );
         }
     }
 
@@ -427,9 +427,9 @@ 
 		$cache_key = maybe_serialize( $where ) . $order_by . 'l' . $limit . 'b' . $blog_id;
         if ( self::$use_cache ) {
             // make sure old cache doesn't get saved as a transient
-            $results = wp_cache_get($cache_key, 'frm_field');
+            $results = wp_cache_get( $cache_key, 'frm_field' );
             if ( false !== $results ) {
-                return stripslashes_deep($results);
+                return stripslashes_deep( $results );
             }
         }
 
@@ -459,11 +459,11 @@ 
         $query = "SELECT fi.*, fr.name as form_name  FROM {$table_name} fi LEFT OUTER JOIN {$form_table_name} fr ON fi.form_id=fr.id";
         $query_type = ( $limit == ' LIMIT 1' || $limit == 1 ) ? 'row' : 'results';
 
-        if ( is_array($where) ) {
+        if ( is_array( $where ) ) {
             $results = FrmDb::get_var( $table_name . ' fi LEFT OUTER JOIN ' . $form_table_name . ' fr ON fi.form_id=fr.id', $where, 'fi.*, fr.name as form_name', array( 'order_by' => $order_by, 'limit' => $limit ), '', $query_type );
 		} else {
 			// if the query is not an array, then it has already been prepared
-			$query .= FrmDb::prepend_and_or_where(' WHERE ', $where ) . $order_by . $limit;
+			$query .= FrmDb::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
 
 			$function_name = ( $query_type == 'row' ) ? 'get_row' : 'get_results';
 			$results = $wpdb->$function_name( $query );
@@ -486,9 +486,9 @@ 
 				FrmDb::set_cache( $result->id, $result, 'frm_field' );
 				FrmDb::set_cache( $result->field_key, $result, 'frm_field' );
 
-				$results[ $r_key ]->field_options = maybe_unserialize( $result->field_options );
-				$results[ $r_key ]->options = maybe_unserialize( $result->options );
-				$results[ $r_key ]->default_value = maybe_unserialize( $result->default_value );
+				$results[$r_key]->field_options = maybe_unserialize( $result->field_options );
+				$results[$r_key]->options = maybe_unserialize( $result->options );
+				$results[$r_key]->default_value = maybe_unserialize( $result->default_value );
 
 				unset( $r_key, $result );
 			}
@@ -507,8 +507,8 @@ 
 	private static function prepare_options( &$results ) {
 		$results->field_options = maybe_unserialize( $results->field_options );
 
-		$results->options = maybe_unserialize($results->options);
-		$results->default_value = maybe_unserialize($results->default_value);
+		$results->options = maybe_unserialize( $results->options );
+		$results->default_value = maybe_unserialize( $results->default_value );
 	}
 
 	/**
@@ -535,7 +535,7 @@ 
 
 			if ( count( $next_fields ) >= self::$transient_size ) {
 				// if this transient is full, check for another
-				$next++;
+				$next ++;
 				self::get_next_transient( $fields, $base_name, $next );
 			}
 		}
@@ -561,7 +561,7 @@ 
 				return;
 			}
 
-			$next++;
+			$next ++;
 		}
 	}
 
@@ -615,7 +615,7 @@ 
 		$field_type = is_array( $field ) ? $field['type'] : $field->type;
 		$data_type = self::get_option( $field, 'data_type' );
 
-		return self::is_option_true( $field, 'multiple' ) && ( ( $field_type == 'select' || ( $field_type == 'data' && $data_type == 'select') ) );
+		return self::is_option_true( $field, 'multiple' ) && ( ( $field_type == 'select' || ( $field_type == 'data' && $data_type == 'select' ) ) );
 	}
 
 	/**
@@ -661,23 +661,23 @@ 
 	}
 
 	public static function is_option_true_in_array( $field, $option ) {
-		return isset( $field[ $option ] ) && $field[ $option ];
+		return isset( $field[$option] ) && $field[$option];
 	}
 
 	public static function is_option_true_in_object( $field, $option ) {
-		return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ];
+		return isset( $field->field_options[$option] ) && $field->field_options[$option];
 	}
 
 	public static function is_option_empty_in_array( $field, $option ) {
-		return ! isset( $field[ $option ] ) || empty( $field[ $option ] );
+		return ! isset( $field[$option] ) || empty( $field[$option] );
 	}
 
 	public static function is_option_empty_in_object( $field, $option ) {
-		return ! isset( $field->field_options[ $option ] ) || empty( $field->field_options[ $option ] );
+		return ! isset( $field->field_options[$option] ) || empty( $field->field_options[$option] );
 	}
 
 	public static function is_option_value_in_object( $field, $option ) {
-		return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ] != '';
+		return isset( $field->field_options[$option] ) && $field->field_options[$option] != '';
 	}
 
 	/**
@@ -693,11 +693,11 @@ 
 	}
 
 	public static function get_option_in_array( $field, $option ) {
-		return isset( $field[ $option ] ) ? $field[ $option ] : '';
+		return isset( $field[$option] ) ? $field[$option] : '';
 	}
 
 	public static function get_option_in_object( $field, $option ) {
-		return isset( $field->field_options[ $option ] ) ? $field->field_options[ $option ] : '';
+		return isset( $field->field_options[$option] ) ? $field->field_options[$option] : '';
 	}
 
 	/**

classes/models/FrmForm.php

Indentation +319 added lines, -319 removed lines

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

Spacing +94 added lines, -94 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
-    die('You are not allowed to call this page directly.');
+if ( ! defined( 'ABSPATH' ) ) {
+    die( 'You are not allowed to call this page directly.' );
 }
 
 class FrmForm {
@@ -15,24 +15,24 @@ 
 			'form_key'      => FrmAppHelper::get_unique_key( $values['form_key'], $wpdb->prefix . 'frm_forms', 'form_key' ),
             'name'          => $values['name'],
             'description'   => $values['description'],
-            'status'        => isset($values['status']) ? $values['status'] : 'draft',
-            'logged_in'     => isset($values['logged_in']) ? $values['logged_in'] : 0,
-            'is_template'   => isset($values['is_template']) ? (int) $values['is_template'] : 0,
+            'status'        => isset( $values['status'] ) ? $values['status'] : 'draft',
+            'logged_in'     => isset( $values['logged_in'] ) ? $values['logged_in'] : 0,
+            'is_template'   => isset( $values['is_template'] ) ? (int) $values['is_template'] : 0,
 			'parent_form_id' => isset( $values['parent_form_id'] ) ? absint( $values['parent_form_id'] ) : 0,
-            'editable'      => isset($values['editable']) ? (int) $values['editable'] : 0,
-            'default_template' => isset($values['default_template']) ? (int) $values['default_template'] : 0,
-            'created_at'    => isset($values['created_at']) ? $values['created_at'] : current_time('mysql', 1),
+            'editable'      => isset( $values['editable'] ) ? (int) $values['editable'] : 0,
+            'default_template' => isset( $values['default_template'] ) ? (int) $values['default_template'] : 0,
+            'created_at'    => isset( $values['created_at'] ) ? $values['created_at'] : current_time( 'mysql', 1 ),
         );
 
 		$options = isset( $values['options'] ) ? (array) $values['options'] : array();
 		FrmFormsHelper::fill_form_options( $options, $values );
 
-        $options['before_html'] = isset($values['options']['before_html']) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html('before');
-        $options['after_html'] = isset($values['options']['after_html']) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html('after');
-        $options['submit_html'] = isset($values['options']['submit_html']) ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html('submit');
+        $options['before_html'] = isset( $values['options']['before_html'] ) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html( 'before' );
+        $options['after_html'] = isset( $values['options']['after_html'] ) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html( 'after' );
+        $options['submit_html'] = isset( $values['options']['submit_html'] ) ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html( 'submit' );
 
-        $options = apply_filters('frm_form_options_before_update', $options, $values);
-        $new_values['options'] = serialize($options);
+        $options = apply_filters( 'frm_form_options_before_update', $options, $values );
+        $new_values['options'] = serialize( $options );
 
         //if(isset($values['id']) && is_numeric($values['id']))
         //    $new_values['id'] = $values['id'];
@@ -67,22 +67,22 @@ 
             'status'        => $template ? 'published' : 'draft',
             'logged_in'     => $values->logged_in ? $values->logged_in : 0,
             'editable'      => $values->editable ? $values->editable : 0,
-            'created_at'    => current_time('mysql', 1),
+            'created_at'    => current_time( 'mysql', 1 ),
             'is_template'   => $template ? 1 : 0,
         );
 
         if ( $blog_id ) {
             $new_values['status'] = 'published';
-            $new_options = maybe_unserialize($values->options);
-            $new_options['email_to'] = get_option('admin_email');
+            $new_options = maybe_unserialize( $values->options );
+            $new_options['email_to'] = get_option( 'admin_email' );
             $new_options['copy'] = false;
             $new_values['options'] = $new_options;
         } else {
             $new_values['options'] = $values->options;
         }
 
-        if ( is_array($new_values['options']) ) {
-            $new_values['options'] = serialize($new_values['options']);
+        if ( is_array( $new_values['options'] ) ) {
+            $new_values['options'] = serialize( $new_values['options'] );
         }
 
 		$query_results = $wpdb->insert( $wpdb->prefix . 'frm_forms', $new_values );
@@ -92,7 +92,7 @@ 
 			self::clear_form_cache();
 
             $form_id = $wpdb->insert_id;
-            FrmField::duplicate($id, $form_id, $copy_keys, $blog_id);
+            FrmField::duplicate( $id, $form_id, $copy_keys, $blog_id );
 
             // update form settings after fields are created
 			do_action( 'frm_after_duplicate_form', $form_id, $new_values, array( 'old_id' => $id ) );
@@ -106,11 +106,11 @@ 
 		$new_opts = maybe_unserialize( $values['options'] );
 		$values['options'] = $new_opts;
 
-        if ( isset($new_opts['success_msg']) ) {
-            $new_opts['success_msg'] = FrmFieldsHelper::switch_field_ids($new_opts['success_msg']);
+        if ( isset( $new_opts['success_msg'] ) ) {
+            $new_opts['success_msg'] = FrmFieldsHelper::switch_field_ids( $new_opts['success_msg'] );
         }
 
-        $new_opts = apply_filters('frm_after_duplicate_form_values', $new_opts, $form_id);
+        $new_opts = apply_filters( 'frm_after_duplicate_form_values', $new_opts, $form_id );
 
         if ( $new_opts != $values['options'] ) {
             global $wpdb;
@@ -128,17 +128,17 @@ 
             $values['status'] = 'published';
         }
 
-        if ( isset($values['form_key']) ) {
+        if ( isset( $values['form_key'] ) ) {
 			$values['form_key'] = FrmAppHelper::get_unique_key( $values['form_key'], $wpdb->prefix . 'frm_forms', 'form_key', $id );
         }
 
 		$form_fields = array( 'form_key', 'name', 'description', 'status', 'parent_form_id' );
 
-        $new_values = self::set_update_options( array(), $values);
+        $new_values = self::set_update_options( array(), $values );
 
         foreach ( $values as $value_key => $value ) {
 			if ( $value_key && in_array( $value_key, $form_fields ) ) {
-				$new_values[ $value_key ] = $value;
+				$new_values[$value_key] = $value;
             }
         }
 
@@ -154,9 +154,9 @@ 
         } else {
             $query_results = true;
         }
-        unset($new_values);
+        unset( $new_values );
 
-        $values = self::update_fields($id, $values);
+        $values = self::update_fields( $id, $values );
 
 		do_action( 'frm_update_form', $id, $values );
 		do_action( 'frm_update_form_' . $id, $values );
@@ -168,20 +168,20 @@ 
      * @return array
      */
 	public static function set_update_options( $new_values, $values ) {
-        if ( ! isset($values['options']) ) {
+        if ( ! isset( $values['options'] ) ) {
             return $new_values;
         }
 
 		$options = isset( $values['options'] ) ? (array) $values['options'] : array();
 		FrmFormsHelper::fill_form_options( $options, $values );
 
-        $options['custom_style'] = isset($values['options']['custom_style']) ? $values['options']['custom_style'] : 0;
-        $options['before_html'] = isset($values['options']['before_html']) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html('before');
-        $options['after_html'] = isset($values['options']['after_html']) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html('after');
-        $options['submit_html'] = (isset($values['options']['submit_html']) && $values['options']['submit_html'] != '') ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html('submit');
+        $options['custom_style'] = isset( $values['options']['custom_style'] ) ? $values['options']['custom_style'] : 0;
+        $options['before_html'] = isset( $values['options']['before_html'] ) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html( 'before' );
+        $options['after_html'] = isset( $values['options']['after_html'] ) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html( 'after' );
+        $options['submit_html'] = ( isset( $values['options']['submit_html'] ) && $values['options']['submit_html'] != '' ) ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html( 'submit' );
 
-        $options = apply_filters('frm_form_options_before_update', $options, $values);
-        $new_values['options'] = serialize($options);
+        $options = apply_filters( 'frm_form_options_before_update', $options, $values );
+        $new_values['options'] = serialize( $options );
 
         return $new_values;
     }
@@ -192,54 +192,54 @@ 
      */
 	public static function update_fields( $id, $values ) {
 
-        if ( ! isset($values['item_meta']) && ! isset($values['field_options']) ) {
+        if ( ! isset( $values['item_meta'] ) && ! isset( $values['field_options'] ) ) {
             return $values;
         }
 
-        $all_fields = FrmField::get_all_for_form($id);
-        if ( empty($all_fields) ) {
+        $all_fields = FrmField::get_all_for_form( $id );
+        if ( empty( $all_fields ) ) {
             return $values;
         }
 
-        if ( ! isset($values['item_meta']) ) {
+        if ( ! isset( $values['item_meta'] ) ) {
             $values['item_meta'] = array();
         }
 
         $field_array = array();
-        $existing_keys = array_keys($values['item_meta']);
+        $existing_keys = array_keys( $values['item_meta'] );
         foreach ( $all_fields as $fid ) {
-            if ( ! in_array($fid->id, $existing_keys) && ( isset($values['frm_fields_submitted']) && in_array($fid->id, $values['frm_fields_submitted']) ) || isset($values['options']) ) {
-				$values['item_meta'][ $fid->id ] = '';
+            if ( ! in_array( $fid->id, $existing_keys ) && ( isset( $values['frm_fields_submitted'] ) && in_array( $fid->id, $values['frm_fields_submitted'] ) ) || isset( $values['options'] ) ) {
+				$values['item_meta'][$fid->id] = '';
             }
-			$field_array[ $fid->id ] = $fid;
+			$field_array[$fid->id] = $fid;
         }
-        unset($all_fields);
+        unset( $all_fields );
 
         foreach ( $values['item_meta'] as $field_id => $default_value ) {
-			if ( isset( $field_array[ $field_id ] ) ) {
-				$field = $field_array[ $field_id ];
+			if ( isset( $field_array[$field_id] ) ) {
+				$field = $field_array[$field_id];
             } else {
-                $field = FrmField::getOne($field_id);
+                $field = FrmField::getOne( $field_id );
             }
 
             if ( ! $field ) {
                 continue;
             }
 
-			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options'][ 'custom_html_' . $field_id ] ) );
+			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options']['custom_html_' . $field_id] ) );
 			if ( $is_settings_page ) {
                 //updating the settings page
-				if ( isset( $values['field_options'][ 'custom_html_' . $field_id ] ) ) {
-					$field->field_options['custom_html'] = isset( $values['field_options'][ 'custom_html_' . $field_id ] ) ? $values['field_options'][ 'custom_html_' . $field_id ] : ( isset( $field->field_options['custom_html'] ) ? $field->field_options['custom_html'] : FrmFieldsHelper::get_default_html( $field->type ) );
-                    $field->field_options = apply_filters('frm_update_form_field_options', $field->field_options, $field, $values);
+				if ( isset( $values['field_options']['custom_html_' . $field_id] ) ) {
+					$field->field_options['custom_html'] = isset( $values['field_options']['custom_html_' . $field_id] ) ? $values['field_options']['custom_html_' . $field_id] : ( isset( $field->field_options['custom_html'] ) ? $field->field_options['custom_html'] : FrmFieldsHelper::get_default_html( $field->type ) );
+                    $field->field_options = apply_filters( 'frm_update_form_field_options', $field->field_options, $field, $values );
 					FrmField::update( $field_id, array( 'field_options' => $field->field_options ) );
                 } else if ( $field->type == 'hidden' || $field->type == 'user_id' ) {
                     $prev_opts = $field->field_options;
-                    $field->field_options = apply_filters('frm_update_form_field_options', $field->field_options, $field, $values);
+                    $field->field_options = apply_filters( 'frm_update_form_field_options', $field->field_options, $field, $values );
                     if ( $prev_opts != $field->field_options ) {
 						FrmField::update( $field_id, array( 'field_options' => $field->field_options ) );
                     }
-                    unset($prev_opts);
+                    unset( $prev_opts );
                 }
             }
 
@@ -253,11 +253,11 @@ 
 			$update_options = apply_filters( 'frm_field_options_to_update', $update_options );
 
 			foreach ( $update_options as $opt => $default ) {
-				$field->field_options[ $opt ] = isset( $values['field_options'][ $opt . '_' . $field_id ] ) ? trim( sanitize_text_field( $values['field_options'][ $opt . '_' . $field_id ] ) ) : $default;
+				$field->field_options[$opt] = isset( $values['field_options'][$opt . '_' . $field_id] ) ? trim( sanitize_text_field( $values['field_options'][$opt . '_' . $field_id] ) ) : $default;
             }
 
-            $field->field_options = apply_filters('frm_update_field_options', $field->field_options, $field, $values);
-			$default_value = maybe_serialize( $values['item_meta'][ $field_id ] );
+            $field->field_options = apply_filters( 'frm_update_field_options', $field->field_options, $field, $values );
+			$default_value = maybe_serialize( $values['item_meta'][$field_id] );
 
 			$new_field = array(
 				'field_options' => $field->field_options,
@@ -268,7 +268,7 @@ 
 
 			FrmField::update( $field_id, $new_field );
 
-            FrmField::delete_form_transient($field->form_id);
+            FrmField::delete_form_transient( $field->form_id );
         }
 		self::clear_form_cache();
 
@@ -282,7 +282,7 @@ 
 		);
 		foreach ( $field_cols as $col => $default ) {
 			$default = ( $default === '' ) ? $field->{$col} : $default;
-			$new_field[ $col ] = isset( $values['field_options'][ $col . '_' . $field->id ] ) ? $values['field_options'][ $col . '_' . $field->id ] : $default;
+			$new_field[$col] = isset( $values['field_options'][$col . '_' . $field->id] ) ? $values['field_options'][$col . '_' . $field->id] : $default;
 		}
 	}
 
@@ -292,17 +292,17 @@ 
      */
 	public static function set_status( $id, $status ) {
         if ( 'trash' == $status ) {
-            return self::trash($id);
+            return self::trash( $id );
         }
 
-		$statuses  = array( 'published', 'draft', 'trash' );
+		$statuses = array( 'published', 'draft', 'trash' );
         if ( ! in_array( $status, $statuses ) ) {
             return false;
         }
 
         global $wpdb;
 
-        if ( is_array($id) ) {
+        if ( is_array( $id ) ) {
 			$where = array( 'id' => $id, 'parent_form_id' => $id, 'or' => 1 );
 			FrmDb::get_where_clause_and_values( $where );
 			array_unshift( $where['values'], $status );
@@ -328,7 +328,7 @@ 
             return self::destroy( $id );
         }
 
-        $form = self::getOne($id);
+        $form = self::getOne( $id );
         if ( ! $form ) {
             return false;
         }
@@ -362,7 +362,7 @@ 
 	public static function destroy( $id ) {
         global $wpdb;
 
-        $form = self::getOne($id);
+        $form = self::getOne( $id );
         if ( ! $form ) {
             return false;
         }
@@ -371,8 +371,8 @@ 
         // Disconnect the entries from this form
 		$entries = FrmDb::get_col( $wpdb->prefix . 'frm_items', array( 'form_id' => $id ) );
         foreach ( $entries as $entry_id ) {
-            FrmEntry::destroy($entry_id);
-            unset($entry_id);
+            FrmEntry::destroy( $entry_id );
+            unset( $entry_id );
         }
 
         // Disconnect the fields from this form
@@ -382,7 +382,7 @@ 
         if ( $query_results ) {
             // Delete all form actions linked to this form
             $action_control = FrmFormActionsController::get_form_actions( 'email' );
-            $action_control->destroy($id, 'all');
+            $action_control->destroy( $id, 'all' );
 
 			// Clear form caching
 			self::clear_form_cache();
@@ -416,7 +416,7 @@ 
 			$form->options = maybe_unserialize( $form->options );
 			if ( ! isset( $form->options['trash_time'] ) || $form->options['trash_time'] < $delete_timestamp ) {
 				self::destroy( $form->id );
-				$count++;
+				$count ++;
 			}
 
 			unset( $form );
@@ -430,13 +430,13 @@ 
     public static function getName( $id ) {
 		$form = FrmDb::check_cache( $id, 'frm_form' );
         if ( $form ) {
-            $r = stripslashes($form->name);
+            $r = stripslashes( $form->name );
             return $r;
         }
 
         $query_key = is_numeric( $id ) ? 'id' : 'form_key';
         $r = FrmDb::get_var( 'frm_forms', array( $query_key => $id ), 'name' );
-        $r = stripslashes($r);
+        $r = stripslashes( $r );
 
         return $r;
     }
@@ -489,17 +489,17 @@ 
 			$table_name = $prefix . 'frm_forms';
         } else {
 			$table_name = $wpdb->prefix . 'frm_forms';
-            $cache = wp_cache_get($id, 'frm_form');
+            $cache = wp_cache_get( $id, 'frm_form' );
             if ( $cache ) {
-                if ( isset($cache->options) ) {
-                    $cache->options = maybe_unserialize($cache->options);
+                if ( isset( $cache->options ) ) {
+                    $cache->options = maybe_unserialize( $cache->options );
                 }
 
-                return stripslashes_deep($cache);
+                return stripslashes_deep( $cache );
             }
         }
 
-        if ( is_numeric($id) ) {
+        if ( is_numeric( $id ) ) {
             $where = array( 'id' => $id );
         } else {
             $where = array( 'form_key' => $id );
@@ -507,11 +507,11 @@ 
 
         $results = FrmDb::get_row( $table_name, $where );
 
-        if ( isset($results->options) ) {
+        if ( isset( $results->options ) ) {
 			FrmDb::set_cache( $results->id, $results, 'frm_form' );
-            $results->options = maybe_unserialize($results->options);
+            $results->options = maybe_unserialize( $results->options );
         }
-        return stripslashes_deep($results);
+        return stripslashes_deep( $results );
     }
 
     /**
@@ -540,7 +540,7 @@ 
 			$results = reset( $results );
 		}
 
-        return stripslashes_deep($results);
+        return stripslashes_deep( $results );
     }
 
 	/**
@@ -580,19 +580,19 @@ 
     	foreach ( $results as $row ) {
             if ( 'trash' != $row->status ) {
     	        if ( $row->is_template ) {
-					$counts['template']++;
+					$counts['template'] ++;
     	        } else {
-					$counts['published']++;
+					$counts['published'] ++;
     	        }
     	    } else {
-				$counts['trash']++;
+				$counts['trash'] ++;
         	}
 
     	    if ( 'draft' == $row->status ) {
-				$counts['draft']++;
+				$counts['draft'] ++;
     	    }
 
-    		unset($row);
+    		unset( $row );
     	}
 
     	$counts = (object) $counts;
@@ -618,7 +618,7 @@ 
 	public static function validate( $values ) {
         $errors = array();
 
-        return apply_filters('frm_validate_form', $errors, $values);
+        return apply_filters( 'frm_validate_form', $errors, $values );
     }
 
 	public static function get_params( $form = null ) {
@@ -630,11 +630,11 @@ 
 			self::maybe_get_form( $form );
 		}
 
-		if ( isset( $frm_vars['form_params'] ) && is_array( $frm_vars['form_params'] ) && isset( $frm_vars['form_params'][ $form->id ] ) ) {
-			return $frm_vars['form_params'][ $form->id ];
+		if ( isset( $frm_vars['form_params'] ) && is_array( $frm_vars['form_params'] ) && isset( $frm_vars['form_params'][$form->id] ) ) {
+			return $frm_vars['form_params'][$form->id];
 		}
 
-		$action_var = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
+		$action_var = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
 		$action = apply_filters( 'frm_show_new_entry_page', FrmAppHelper::get_param( $action_var, 'new', 'get', 'sanitize_title' ), $form );
 
 		$default_values = array(
@@ -652,15 +652,15 @@ 
 			//if there are two forms on the same page, make sure not to submit both
 			foreach ( $default_values as $var => $default ) {
 				if ( $var == 'action' ) {
-					$values[ $var ] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
+					$values[$var] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
 				} else {
-					$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
+					$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
 				}
 				unset( $var, $default );
 			}
 		} else {
 			foreach ( $default_values as $var => $default ) {
-				$values[ $var ] = $default;
+				$values[$var] = $default;
 				unset( $var, $default );
 			}
 		}
@@ -675,7 +675,7 @@ 
 	public static function list_page_params() {
 		$values = array();
 		foreach ( array( 'template' => 0, 'id' => '', 'paged' => 1, 'form' => '', 'search' => '', 'sort' => '', 'sdir' => '' ) as $var => $default ) {
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
+			$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
 		}
 
 		return $values;
@@ -695,7 +695,7 @@ 
 			'field_id' => '', 'search' => '', 'sort' => '', 'sdir' => '', 'fid' => '',
 			'keep_post' => '',
 		) as $var => $default ) {
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
+			$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
 		}
 
 		return $values;
@@ -752,7 +752,7 @@ 
 		$small_form = new stdClass();
 		foreach ( array( 'id', 'form_key', 'name' ) as $var ) {
 			$small_form->{$var} = $form->{$var};
-			unset($var);
+			unset( $var );
 		}
 
 		$frm_vars['forms_loaded'][] = $small_form;
@@ -762,7 +762,7 @@ 
 			$frm_vars['load_css'] = true;
 		}
 
-		return ( ( ! isset($frm_vars['css_loaded']) || ! $frm_vars['css_loaded'] ) && $global_load );
+		return ( ( ! isset( $frm_vars['css_loaded'] ) || ! $frm_vars['css_loaded'] ) && $global_load );
 	}
 
 	public static function show_submit( $form ) {
@@ -776,6 +776,6 @@ 
 	 */
 	public static function get_option( $atts ) {
 		$form = $atts['form'];
-		return isset( $form->options[ $atts['option'] ] ) ? $form->options[ $atts['option'] ] : $atts['default'];
+		return isset( $form->options[$atts['option']] ) ? $form->options[$atts['option']] : $atts['default'];
 	}
 }

classes/models/FrmEntryMeta.php

Indentation +175 added lines, -175 removed lines

@@ -5,25 +5,25 @@ 
 
 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 0;
-        }
+		if ( FrmAppHelper::is_empty_value( $meta_value ) ) {
+			// don't save blank fields
+			return 0;
+		}
 
-        $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 );
 
@@ -35,40 +35,40 @@ 
 			$id = 0;
 		}
 
-        return $id;
-    }
+		return $id;
+	}
 
-    /**
-     * @param string $meta_key
-     */
+	/**
+	 * @param string $meta_key
+	 */
 	public static function update_entry_meta( $entry_id, $field_id, $meta_key = null, $meta_value ) {
-        if ( ! $field_id ) {
-            return false;
-        }
+		if ( ! $field_id ) {
+			return false;
+		}
 
-        global $wpdb;
+		global $wpdb;
 
 		$values = array( 'item_id' => $entry_id, 'field_id' => $field_id );
 		$where_values = $values;
-        $values['meta_value'] = $meta_value;
-        $values = apply_filters('frm_update_entry_meta', $values);
+		$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 );
-    }
+	}
 
 	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 ) {
+		foreach ( $values as $field_id => $meta_value ) {
 			$field = false;
 			if ( ! empty( $field_id ) ) {
 				$field = FrmField::getOne( $field_id );
@@ -92,39 +92,39 @@ 
 			}
 		}
 
-        if ( empty($prev_values) ) {
-            return;
-        }
+		if ( empty($prev_values) ) {
+			return;
+		}
 
-        $prev_values = array_diff($prev_values, array_keys($values));
+		$prev_values = array_diff($prev_values, array_keys($values));
 
-        if ( empty($prev_values) ) {
-            return;
-        }
+		if ( empty($prev_values) ) {
+			return;
+		}
 
 		// prepare the query
 		$where = array( 'item_id' => $entry_id, 'field_id' => $prev_values );
 		FrmDb::get_where_clause_and_values( $where );
 
-        // Delete any leftovers
-        $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_item_metas ' . $where['where'], $where['values'] ) );
+		// Delete any leftovers
+		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_item_metas ' . $where['where'], $where['values'] ) );
 		self::clear_cache();
-    }
+	}
 
 	public static function duplicate_entry_metas( $old_id, $new_id ) {
-        $metas = self::get_entry_meta_info($old_id);
-        foreach ( $metas as $meta ) {
-            self::add_entry_meta($new_id, $meta->field_id, null, $meta->meta_value);
-            unset($meta);
-        }
+		$metas = self::get_entry_meta_info($old_id);
+		foreach ( $metas as $meta ) {
+			self::add_entry_meta($new_id, $meta->field_id, null, $meta->meta_value);
+			unset($meta);
+		}
 		self::clear_cache();
-    }
+	}
 
 	public static function delete_entry_meta( $entry_id, $field_id ) {
-        global $wpdb;
+		global $wpdb;
 		self::clear_cache();
-        return $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->prefix}frm_item_metas WHERE field_id=%d AND item_id=%d", $field_id, $entry_id));
-    }
+		return $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->prefix}frm_item_metas WHERE field_id=%d AND item_id=%d", $field_id, $entry_id));
+	}
 
 	/**
 	 * Clear entry meta caching
@@ -149,7 +149,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;
@@ -162,130 +162,130 @@ 
 
 		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_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 = FrmDb::check_cache($cache_key, 'frm_entry', $query, 'get_col');
+		$values = FrmDb::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';
+		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'] ) {
+		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 {
+		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['is_draft'] ) {
+			$query[] = 'AND e.is_draft=0';
+		}
 
-        if ( $args['value'] ) {
-            $query[] = $wpdb->prepare(' AND meta_value=%s', $args['value']);
-        }
-        $query[] = $order . $limit;
-    }
+		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' .
-            FrmDb::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+			FrmDb::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
 
 		$cache_key = 'all_' . maybe_serialize( $where ) . $order_by . $limit;
-        $results = FrmDb::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_row' : 'get_results'));
+		$results = FrmDb::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 = FrmDb::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_var' : 'get_col'));
+		$results = FrmDb::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 );
@@ -299,89 +299,89 @@ 
 		$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;
-            }
-
-            if ( ! empty($args['user_id']) ) {
-                $where['e.user_id'] = $args['user_id'];
-            }
-            $query[] = FrmDb::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+		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[] = FrmDb::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 ( ! 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;
+		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;
-        }
+		} else {
+			$where .= $draft_where . $user_where;
+		}
 
 		// The query has already been prepared
 		$query[] = FrmDb::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
-    }
+	}
 
-    public static function search_entry_metas( $search, $field_id = '', $operator ) {
+	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;
-        }
+		$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;
-                }
+					continue;
+				}
 
-                switch ( $field ) {
-                    case 'year':
+				switch ( $field ) {
+					case 'year':
 						$value = '%' . $value;
-                    break;
-                    case 'month':
-                        $value .= '%';
-                    break;
-                    case 'day':
+					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);
+			}
+			$where .= $wpdb->prepare(' field_id=%d', $field_id);
 			$query = 'SELECT DISTINCT item_id FROM ' . $wpdb->prefix . 'frm_item_metas' . FrmDb::prepend_and_or_where( ' WHERE ', $where );
-        } else {
+		} 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);
+		$results = $wpdb->get_col($query, 0);
 		FrmDb::set_cache( $cache_key, $results, 'frm_entry' );
 
-        return $results;
-    }
+		return $results;
+	}
 }

Spacing +53 added lines, -53 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -20,10 +20,10 @@ 
 			'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 );
 
@@ -51,13 +51,13 @@ 
 		$values = array( 'item_id' => $entry_id, 'field_id' => $field_id );
 		$where_values = $values;
         $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 );
@@ -77,11 +77,11 @@ 
 			// set the value for the file upload field and add new tags (in Pro version)
 			$meta_value = apply_filters( 'frm_prepare_data_before_db', $meta_value, $field_id, $entry_id, compact( 'field' ) );
 
-			if ( $prev_values && in_array($field_id, $prev_values) ) {
+			if ( $prev_values && in_array( $field_id, $prev_values ) ) {
 
 				if ( ( is_array( $meta_value ) && empty( $meta_value ) ) || ( ! is_array( $meta_value ) && trim( $meta_value ) == '' ) ) {
 					// remove blank fields
-					unset( $values[ $field_id ] );
+					unset( $values[$field_id] );
 				} else {
 					// if value exists, then update it
 					self::update_entry_meta( $entry_id, $field_id, '', $meta_value );
@@ -92,13 +92,13 @@ 
 			}
 		}
 
-        if ( empty($prev_values) ) {
+        if ( empty( $prev_values ) ) {
             return;
         }
 
-        $prev_values = array_diff($prev_values, array_keys($values));
+        $prev_values = array_diff( $prev_values, array_keys( $values ) );
 
-        if ( empty($prev_values) ) {
+        if ( empty( $prev_values ) ) {
             return;
         }
 
@@ -112,10 +112,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();
     }
@@ -123,7 +123,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 ) );
     }
 
 	/**
@@ -142,7 +142,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 );
 		}
@@ -160,14 +160,14 @@ 
 			$cached = FrmDb::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';
 		$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';
@@ -175,8 +175,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;
     }
@@ -186,22 +186,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 = FrmDb::check_cache($cache_key, 'frm_entry', $query, 'get_col');
+        $values = FrmDb::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 );
     }
 
     /**
@@ -218,8 +218,8 @@ 
 			$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 );
         }
@@ -229,7 +229,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;
     }
@@ -243,18 +243,18 @@ 
         $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' .
-            FrmDb::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+            FrmDb::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
 
 		$cache_key = 'all_' . maybe_serialize( $where ) . $order_by . $limit;
-        $results = FrmDb::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_row' : 'get_results'));
+        $results = FrmDb::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;
@@ -266,14 +266,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 = FrmDb::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_var' : 'get_col'));
+        $results = FrmDb::check_cache( $cache_key, 'frm_entry', $query, ( $limit == ' LIMIT 1' ? 'get_var' : 'get_col' ) );
 
         return $results;
     }
@@ -299,17 +299,17 @@ 
 		$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 ( 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[] = FrmDb::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+            $query[] = FrmDb::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
 
 			if ( $args['group_by'] ) {
 				$query[] = ' GROUP BY ' . sanitize_text_field( $args['group_by'] );
@@ -325,13 +325,13 @@ 
 			$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];
@@ -340,12 +340,12 @@ 
         }
 
 		// The query has already been prepared
-		$query[] = FrmDb::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+		$query[] = FrmDb::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');
+        $results = wp_cache_get( $cache_key, 'frm_entry' );
         if ( false !== $results ) {
             return $results;
         }
@@ -368,18 +368,18 @@ 
                     case 'day':
 						$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);
+            $where .= $wpdb->prepare( ' field_id=%d', $field_id );
 			$query = 'SELECT DISTINCT item_id FROM ' . $wpdb->prefix . 'frm_item_metas' . FrmDb::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);
+        $results = $wpdb->get_col( $query, 0 );
 		FrmDb::set_cache( $cache_key, $results, 'frm_entry' );
 
         return $results;

classes/models/FrmMigrate.php

Indentation +161 added lines, -161 removed lines

@@ -76,11 +76,11 @@ 
 		return $charset_collate;
 	}
 
-    private function create_tables() {
-        $charset_collate = $this->collation();
-        $sql = array();
+	private function create_tables() {
+		$charset_collate = $this->collation();
+		$sql = array();
 
-        /* Create/Upgrade Fields Table */
+		/* Create/Upgrade Fields Table */
 		$sql[] = 'CREATE TABLE ' . $this->fields . ' (
 				id BIGINT(20) NOT NULL auto_increment,
 				field_key varchar(100) default NULL,
@@ -99,7 +99,7 @@ 
                 UNIQUE KEY field_key (field_key)
         )';
 
-        /* Create/Upgrade Forms Table */
+		/* Create/Upgrade Forms Table */
 		$sql[] = 'CREATE TABLE ' . $this->forms . ' (
                 id int(11) NOT NULL auto_increment,
 				form_key varchar(100) default NULL,
@@ -117,7 +117,7 @@ 
                 UNIQUE KEY form_key (form_key)
         )';
 
-        /* Create/Upgrade Items Table */
+		/* Create/Upgrade Items Table */
 		$sql[] = 'CREATE TABLE ' . $this->entries . ' (
 				id BIGINT(20) NOT NULL auto_increment,
 				item_key varchar(100) default NULL,
@@ -140,7 +140,7 @@ 
                 UNIQUE KEY item_key (item_key)
         )';
 
-        /* Create/Upgrade Meta Table */
+		/* Create/Upgrade Meta Table */
 		$sql[] = 'CREATE TABLE ' . $this->entry_metas . ' (
 				id BIGINT(20) NOT NULL auto_increment,
 				meta_value longtext default NULL,
@@ -152,16 +152,16 @@ 
                 KEY item_id (item_id)
         )';
 
-        foreach ( $sql as $q ) {
+		foreach ( $sql as $q ) {
 			if ( function_exists( 'dbDelta' ) ) {
 				dbDelta( $q . $charset_collate . ';' );
 			} else {
 				global $wpdb;
 				$wpdb->query( $q . $charset_collate );
 			}
-            unset($q);
-        }
-    }
+			unset($q);
+		}
+	}
 
 	private function maybe_create_contact_form() {
 		$template_id = FrmForm::getIdByKey( 'contact' );
@@ -177,45 +177,45 @@ 
 		}
 	}
 
-    /**
-     * @param integer $frm_db_version
+	/**
+	 * @param integer $frm_db_version
 	 * @param int $old_db_version
-     */
+	 */
 	private function migrate_data( $frm_db_version, $old_db_version ) {
 		$migrations = array( 4, 6, 11, 16, 17, 23, 25 );
-        foreach ( $migrations as $migration ) {
-            if ( $frm_db_version >= $migration && $old_db_version < $migration ) {
+		foreach ( $migrations as $migration ) {
+			if ( $frm_db_version >= $migration && $old_db_version < $migration ) {
 				$function_name = 'migrate_to_' . $migration;
-                $this->$function_name();
-            }
-        }
-    }
+				$this->$function_name();
+			}
+		}
+	}
 
-    public function uninstall() {
+	public function uninstall() {
 		if ( ! current_user_can( 'administrator' ) ) {
-            $frm_settings = FrmAppHelper::get_settings();
-            wp_die($frm_settings->admin_permission);
-        }
+			$frm_settings = FrmAppHelper::get_settings();
+			wp_die($frm_settings->admin_permission);
+		}
 
-        global $wpdb, $wp_roles;
+		global $wpdb, $wp_roles;
 
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->fields );
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->forms );
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->entries );
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->entry_metas );
 
-        delete_option('frm_options');
-        delete_option('frm_db_version');
-
-        //delete roles
-        $frm_roles = FrmAppHelper::frm_capabilities();
-        $roles = get_editable_roles();
-        foreach ( $frm_roles as $frm_role => $frm_role_description ) {
-            foreach ( $roles as $role => $details ) {
-                $wp_roles->remove_cap( $role, $frm_role );
-                unset($role, $details);
-    		}
-    		unset($frm_role, $frm_role_description);
+		delete_option('frm_options');
+		delete_option('frm_db_version');
+
+		//delete roles
+		$frm_roles = FrmAppHelper::frm_capabilities();
+		$roles = get_editable_roles();
+		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
+			foreach ( $roles as $role => $details ) {
+				$wp_roles->remove_cap( $role, $frm_role );
+				unset($role, $details);
+			}
+			unset($frm_role, $frm_role_description);
 		}
 		unset($roles, $frm_roles);
 
@@ -239,9 +239,9 @@ 
 
 		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->options . ' WHERE option_name LIKE %s OR option_name LIKE %s', '_transient_timeout_frm_form_fields_%', '_transient_frm_form_fields_%' ) );
 
-        do_action('frm_after_uninstall');
-        return true;
-    }
+		do_action('frm_after_uninstall');
+		return true;
+	}
 
 	/**
 	 * Migrate old styling settings. If sites are using the old
@@ -280,150 +280,150 @@ 
 		}
 	}
 
-    /**
-     * Change field size from character to pixel -- Multiply by 9
-     */
-    private function migrate_to_17() {
-        global $wpdb;
+	/**
+	 * Change field size from character to pixel -- Multiply by 9
+	 */
+	private function migrate_to_17() {
+		global $wpdb;
 		$pixel_conversion = 9;
 
-        // Get query arguments
+		// Get query arguments
 		$field_types = array( 'textarea', 'text', 'number', 'email', 'url', 'rte', 'date', 'phone', 'password', 'image', 'tag', 'file' );
 		$query = array( 'type' => $field_types, 'field_options like' => 's:4:"size";', 'field_options not like' => 's:4:"size";s:0:' );
 
-        // Get results
+		// Get results
 		$fields = FrmDb::get_results( $this->fields, $query, 'id, field_options' );
 
-        $updated = 0;
-        foreach ( $fields as $f ) {
-            $f->field_options = maybe_unserialize($f->field_options);
-            if ( empty($f->field_options['size']) || ! is_numeric($f->field_options['size']) ) {
-                continue;
-            }
+		$updated = 0;
+		foreach ( $fields as $f ) {
+			$f->field_options = maybe_unserialize($f->field_options);
+			if ( empty($f->field_options['size']) || ! is_numeric($f->field_options['size']) ) {
+				continue;
+			}
 
 			$f->field_options['size'] = round( $pixel_conversion * (int) $f->field_options['size'] );
-            $f->field_options['size'] .= 'px';
-            $u = FrmField::update( $f->id, array( 'field_options' => $f->field_options ) );
-            if ( $u ) {
-                $updated++;
-            }
-            unset($f);
-        }
-
-        // Change the characters in widgets to pixels
-        $widgets = get_option('widget_frm_show_form');
-        if ( empty($widgets) ) {
-            return;
-        }
-
-        $widgets = maybe_unserialize($widgets);
-        foreach ( $widgets as $k => $widget ) {
-            if ( ! is_array($widget) || ! isset($widget['size']) ) {
-                continue;
-            }
+			$f->field_options['size'] .= 'px';
+			$u = FrmField::update( $f->id, array( 'field_options' => $f->field_options ) );
+			if ( $u ) {
+				$updated++;
+			}
+			unset($f);
+		}
+
+		// Change the characters in widgets to pixels
+		$widgets = get_option('widget_frm_show_form');
+		if ( empty($widgets) ) {
+			return;
+		}
+
+		$widgets = maybe_unserialize($widgets);
+		foreach ( $widgets as $k => $widget ) {
+			if ( ! is_array($widget) || ! isset($widget['size']) ) {
+				continue;
+			}
 			$size = round( $pixel_conversion * (int) $widget['size'] );
-            $size .= 'px';
+			$size .= 'px';
 			$widgets[ $k ]['size'] = $size;
-        }
-        update_option('widget_frm_show_form', $widgets);
-    }
-
-    /**
-     * Migrate post and email notification settings into actions
-     */
-    private function migrate_to_16() {
-        global $wpdb;
-
-        $forms = FrmDb::get_results( $this->forms, array(), 'id, options, is_template, default_template' );
-
-        /**
-        * Old email settings format:
-        * email_to: Email or field id
-        * also_email_to: array of fields ids
-        * reply_to: Email, field id, 'custom'
-        * cust_reply_to: string
-        * reply_to_name: field id, 'custom'
-        * cust_reply_to_name: string
-        * plain_text: 0|1
-        * email_message: string or ''
-        * email_subject: string or ''
-        * inc_user_info: 0|1
-        * update_email: 0, 1, 2
-        *
-        * Old autoresponder settings format:
-        * auto_responder: 0|1
-        * ar_email_message: string or ''
-        * ar_email_to: field id
-        * ar_plain_text: 0|1
-        * ar_reply_to_name: string
-        * ar_reply_to: string
-        * ar_email_subject: string
-        * ar_update_email: 0, 1, 2
-        *
-        * New email settings:
-        * post_content: json settings
-        * post_title: form id
-        * post_excerpt: message
-        *
-        */
-
-        foreach ( $forms as $form ) {
+		}
+		update_option('widget_frm_show_form', $widgets);
+	}
+
+	/**
+	 * Migrate post and email notification settings into actions
+	 */
+	private function migrate_to_16() {
+		global $wpdb;
+
+		$forms = FrmDb::get_results( $this->forms, array(), 'id, options, is_template, default_template' );
+
+		/**
+		 * Old email settings format:
+		 * email_to: Email or field id
+		 * also_email_to: array of fields ids
+		 * reply_to: Email, field id, 'custom'
+		 * cust_reply_to: string
+		 * reply_to_name: field id, 'custom'
+		 * cust_reply_to_name: string
+		 * plain_text: 0|1
+		 * email_message: string or ''
+		 * email_subject: string or ''
+		 * inc_user_info: 0|1
+		 * update_email: 0, 1, 2
+		 *
+		 * Old autoresponder settings format:
+		 * auto_responder: 0|1
+		 * ar_email_message: string or ''
+		 * ar_email_to: field id
+		 * ar_plain_text: 0|1
+		 * ar_reply_to_name: string
+		 * ar_reply_to: string
+		 * ar_email_subject: string
+		 * ar_update_email: 0, 1, 2
+		 *
+		 * New email settings:
+		 * post_content: json settings
+		 * post_title: form id
+		 * post_excerpt: message
+		 *
+		 */
+
+		foreach ( $forms as $form ) {
 			if ( $form->is_template && $form->default_template ) {
 				// don't migrate the default templates since the email will be added anyway
 				continue;
 			}
 
-            // Format form options
-            $form_options = maybe_unserialize($form->options);
+			// Format form options
+			$form_options = maybe_unserialize($form->options);
 
-            // Migrate settings to actions
-            FrmXMLHelper::migrate_form_settings_to_actions( $form_options, $form->id );
-        }
-    }
+			// Migrate settings to actions
+			FrmXMLHelper::migrate_form_settings_to_actions( $form_options, $form->id );
+		}
+	}
 
-    private function migrate_to_11() {
-        global $wpdb;
+	private function migrate_to_11() {
+		global $wpdb;
 
-        $forms = FrmDb::get_results( $this->forms, array(), 'id, options');
+		$forms = FrmDb::get_results( $this->forms, array(), 'id, options');
 
-        $sending = __( 'Sending', 'formidable' );
+		$sending = __( 'Sending', 'formidable' );
 		$img = FrmAppHelper::plugin_url() . '/images/ajax_loader.gif';
-        $old_default_html = <<<DEFAULT_HTML
+		$old_default_html = <<<DEFAULT_HTML
 <div class="frm_submit">
 [if back_button]<input type="submit" value="[back_label]" name="frm_prev_page" formnovalidate="formnovalidate" [back_hook] />[/if back_button]
 <input type="submit" value="[button_label]" [button_action] />
 <img class="frm_ajax_loading" src="$img" alt="$sending" style="visibility:hidden;" />
 </div>
 DEFAULT_HTML;
-        unset($sending, $img);
+		unset($sending, $img);
 
-        $new_default_html = FrmFormsHelper::get_default_html('submit');
-        $draft_link = FrmFormsHelper::get_draft_link();
+		$new_default_html = FrmFormsHelper::get_default_html('submit');
+		$draft_link = FrmFormsHelper::get_draft_link();
 		foreach ( $forms as $form ) {
-            $form->options = maybe_unserialize($form->options);
-            if ( ! isset($form->options['submit_html']) || empty($form->options['submit_html']) ) {
-                continue;
-            }
+			$form->options = maybe_unserialize($form->options);
+			if ( ! isset($form->options['submit_html']) || empty($form->options['submit_html']) ) {
+				continue;
+			}
 
-            if ( $form->options['submit_html'] != $new_default_html && $form->options['submit_html'] == $old_default_html ) {
-                $form->options['submit_html'] = $new_default_html;
+			if ( $form->options['submit_html'] != $new_default_html && $form->options['submit_html'] == $old_default_html ) {
+				$form->options['submit_html'] = $new_default_html;
 				$wpdb->update( $this->forms, array( 'options' => serialize( $form->options ) ), array( 'id' => $form->id ) );
 			} else if ( ! strpos( $form->options['submit_html'], 'save_draft' ) ) {
 				$form->options['submit_html'] = preg_replace( '~\<\/div\>(?!.*\<\/div\>)~', $draft_link . "\r\n</div>", $form->options['submit_html'] );
 				$wpdb->update( $this->forms, array( 'options' => serialize( $form->options ) ), array( 'id' => $form->id ) );
-            }
-            unset($form);
-        }
-        unset($forms);
-    }
+			}
+			unset($form);
+		}
+		unset($forms);
+	}
 
-    private function migrate_to_6() {
-        global $wpdb;
+	private function migrate_to_6() {
+		global $wpdb;
 
 		$no_save = array_merge( FrmField::no_save_fields(), array( 'form', 'hidden', 'user_id' ) );
 		$fields = FrmDb::get_results( $this->fields, array( 'type NOT' => $no_save ), 'id, field_options' );
 
-        $default_html = <<<DEFAULT_HTML
+		$default_html = <<<DEFAULT_HTML
 <div id="frm_field_[id]_container" class="form-field [required_class] [error_class]">
     <label class="frm_pos_[label_position]">[field_name]
         <span class="frm_required">[required_label]</span>
@@ -433,7 +433,7 @@ 
 </div>
 DEFAULT_HTML;
 
-        $old_default_html = <<<DEFAULT_HTML
+		$old_default_html = <<<DEFAULT_HTML
 <div id="frm_field_[id]_container" class="form-field [required_class] [error_class]">
     <label class="frm_pos_[label_position]">[field_name]
         <span class="frm_required">[required_label]</span>
@@ -443,24 +443,24 @@ 
 </div>
 DEFAULT_HTML;
 
-        $new_default_html = FrmFieldsHelper::get_default_html('text');
-        foreach ( $fields as $field ) {
-            $field->field_options = maybe_unserialize($field->field_options);
+		$new_default_html = FrmFieldsHelper::get_default_html('text');
+		foreach ( $fields as $field ) {
+			$field->field_options = maybe_unserialize($field->field_options);
 			$html = FrmField::get_option( $field, 'custom_html' );
 			if ( $html == $default_html || $html == $old_default_html ) {
-                $field->field_options['custom_html'] = $new_default_html;
+				$field->field_options['custom_html'] = $new_default_html;
 				$wpdb->update( $this->fields, array( 'field_options' => maybe_serialize( $field->field_options ) ), array( 'id' => $field->id ) );
-            }
-            unset($field);
-        }
-        unset($default_html, $old_default_html, $fields);
-    }
-
-    private function migrate_to_4() {
-        global $wpdb;
+			}
+			unset($field);
+		}
+		unset($default_html, $old_default_html, $fields);
+	}
+
+	private function migrate_to_4() {
+		global $wpdb;
 		$user_ids = FrmEntryMeta::getAll( array( 'fi.type' => 'user_id' ) );
-        foreach ( $user_ids as $user_id ) {
+		foreach ( $user_ids as $user_id ) {
 			$wpdb->update( $this->entries, array( 'user_id' => $user_id->meta_value ), array( 'id' => $user_id->item_id ) );
-        }
-    }
+		}
+	}
 }

Spacing +36 added lines, -36 removed lines

@@ -7,8 +7,8 @@ 
 	public $entry_metas;
 
 	public function __construct() {
-		if ( ! defined('ABSPATH') ) {
-			die('You are not allowed to call this page directly.');
+		if ( ! defined( 'ABSPATH' ) ) {
+			die( 'You are not allowed to call this page directly.' );
 		}
 
 		global $wpdb;
@@ -26,7 +26,7 @@ 
 		$frm_db_version = FrmAppHelper::$db_version;
 		$old_db_version = (float) $old_db_version;
 		if ( ! $old_db_version ) {
-			$old_db_version = get_option('frm_db_version');
+			$old_db_version = get_option( 'frm_db_version' );
 		}
 
 		if ( $frm_db_version != $old_db_version ) {
@@ -36,10 +36,10 @@ 
 			require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
 			$this->create_tables();
-			$this->migrate_data($frm_db_version, $old_db_version);
+			$this->migrate_data( $frm_db_version, $old_db_version );
 
 			/***** SAVE DB VERSION *****/
-			update_option('frm_db_version', $frm_db_version);
+			update_option( 'frm_db_version', $frm_db_version );
 
 			/**** ADD/UPDATE DEFAULT TEMPLATES ****/
 			FrmXMLController::add_default_templates();
@@ -49,7 +49,7 @@ 
 			}
 		}
 
-		do_action('frm_after_install');
+		do_action( 'frm_after_install' );
 
 		/**** update the styling settings ****/
 		if ( is_admin() && function_exists( 'get_filesystem_method' ) ) {
@@ -159,7 +159,7 @@ 
 				global $wpdb;
 				$wpdb->query( $q . $charset_collate );
 			}
-            unset($q);
+            unset( $q );
         }
     }
 
@@ -194,7 +194,7 @@ 
     public function uninstall() {
 		if ( ! current_user_can( 'administrator' ) ) {
             $frm_settings = FrmAppHelper::get_settings();
-            wp_die($frm_settings->admin_permission);
+            wp_die( $frm_settings->admin_permission );
         }
 
         global $wpdb, $wp_roles;
@@ -204,8 +204,8 @@ 
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->entries );
 		$wpdb->query( 'DROP TABLE IF EXISTS ' . $this->entry_metas );
 
-        delete_option('frm_options');
-        delete_option('frm_db_version');
+        delete_option( 'frm_options' );
+        delete_option( 'frm_db_version' );
 
         //delete roles
         $frm_roles = FrmAppHelper::frm_capabilities();
@@ -213,11 +213,11 @@ 
         foreach ( $frm_roles as $frm_role => $frm_role_description ) {
             foreach ( $roles as $role => $details ) {
                 $wp_roles->remove_cap( $role, $frm_role );
-                unset($role, $details);
+                unset( $role, $details );
     		}
-    		unset($frm_role, $frm_role_description);
+    		unset( $frm_role, $frm_role_description );
 		}
-		unset($roles, $frm_roles);
+		unset( $roles, $frm_roles );
 
 		// delete actions, views, and styles
 
@@ -239,7 +239,7 @@ 
 
 		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->options . ' WHERE option_name LIKE %s OR option_name LIKE %s', '_transient_timeout_frm_form_fields_%', '_transient_frm_form_fields_%' ) );
 
-        do_action('frm_after_uninstall');
+        do_action( 'frm_after_uninstall' );
         return true;
     }
 
@@ -296,8 +296,8 @@ 
 
         $updated = 0;
         foreach ( $fields as $f ) {
-            $f->field_options = maybe_unserialize($f->field_options);
-            if ( empty($f->field_options['size']) || ! is_numeric($f->field_options['size']) ) {
+            $f->field_options = maybe_unserialize( $f->field_options );
+            if ( empty( $f->field_options['size'] ) || ! is_numeric( $f->field_options['size'] ) ) {
                 continue;
             }
 
@@ -305,27 +305,27 @@ 
             $f->field_options['size'] .= 'px';
             $u = FrmField::update( $f->id, array( 'field_options' => $f->field_options ) );
             if ( $u ) {
-                $updated++;
+                $updated ++;
             }
-            unset($f);
+            unset( $f );
         }
 
         // Change the characters in widgets to pixels
-        $widgets = get_option('widget_frm_show_form');
-        if ( empty($widgets) ) {
+        $widgets = get_option( 'widget_frm_show_form' );
+        if ( empty( $widgets ) ) {
             return;
         }
 
-        $widgets = maybe_unserialize($widgets);
+        $widgets = maybe_unserialize( $widgets );
         foreach ( $widgets as $k => $widget ) {
-            if ( ! is_array($widget) || ! isset($widget['size']) ) {
+            if ( ! is_array( $widget ) || ! isset( $widget['size'] ) ) {
                 continue;
             }
 			$size = round( $pixel_conversion * (int) $widget['size'] );
             $size .= 'px';
-			$widgets[ $k ]['size'] = $size;
+			$widgets[$k]['size'] = $size;
         }
-        update_option('widget_frm_show_form', $widgets);
+        update_option( 'widget_frm_show_form', $widgets );
     }
 
     /**
@@ -374,7 +374,7 @@ 
 			}
 
             // Format form options
-            $form_options = maybe_unserialize($form->options);
+            $form_options = maybe_unserialize( $form->options );
 
             // Migrate settings to actions
             FrmXMLHelper::migrate_form_settings_to_actions( $form_options, $form->id );
@@ -384,7 +384,7 @@ 
     private function migrate_to_11() {
         global $wpdb;
 
-        $forms = FrmDb::get_results( $this->forms, array(), 'id, options');
+        $forms = FrmDb::get_results( $this->forms, array(), 'id, options' );
 
         $sending = __( 'Sending', 'formidable' );
 		$img = FrmAppHelper::plugin_url() . '/images/ajax_loader.gif';
@@ -395,13 +395,13 @@ 
 <img class="frm_ajax_loading" src="$img" alt="$sending" style="visibility:hidden;" />
 </div>
 DEFAULT_HTML;
-        unset($sending, $img);
+        unset( $sending, $img );
 
-        $new_default_html = FrmFormsHelper::get_default_html('submit');
+        $new_default_html = FrmFormsHelper::get_default_html( 'submit' );
         $draft_link = FrmFormsHelper::get_draft_link();
 		foreach ( $forms as $form ) {
-            $form->options = maybe_unserialize($form->options);
-            if ( ! isset($form->options['submit_html']) || empty($form->options['submit_html']) ) {
+            $form->options = maybe_unserialize( $form->options );
+            if ( ! isset( $form->options['submit_html'] ) || empty( $form->options['submit_html'] ) ) {
                 continue;
             }
 
@@ -412,9 +412,9 @@ 
 				$form->options['submit_html'] = preg_replace( '~\<\/div\>(?!.*\<\/div\>)~', $draft_link . "\r\n</div>", $form->options['submit_html'] );
 				$wpdb->update( $this->forms, array( 'options' => serialize( $form->options ) ), array( 'id' => $form->id ) );
             }
-            unset($form);
+            unset( $form );
         }
-        unset($forms);
+        unset( $forms );
     }
 
     private function migrate_to_6() {
@@ -443,17 +443,17 @@ 
 </div>
 DEFAULT_HTML;
 
-        $new_default_html = FrmFieldsHelper::get_default_html('text');
+        $new_default_html = FrmFieldsHelper::get_default_html( 'text' );
         foreach ( $fields as $field ) {
-            $field->field_options = maybe_unserialize($field->field_options);
+            $field->field_options = maybe_unserialize( $field->field_options );
 			$html = FrmField::get_option( $field, 'custom_html' );
 			if ( $html == $default_html || $html == $old_default_html ) {
                 $field->field_options['custom_html'] = $new_default_html;
 				$wpdb->update( $this->fields, array( 'field_options' => maybe_serialize( $field->field_options ) ), array( 'id' => $field->id ) );
             }
-            unset($field);
+            unset( $field );
         }
-        unset($default_html, $old_default_html, $fields);
+        unset( $default_html, $old_default_html, $fields );
     }
 
     private function migrate_to_4() {