Strategy11 / formidable-forms

classes/controllers/FrmEntriesController.php

Indentation +252 added lines, -252 removed lines

@@ -2,70 +2,70 @@ 
 
 class FrmEntriesController {
 
-    public static function menu() {
+	public static function menu() {
 		FrmAppHelper::force_capability( 'frm_view_entries' );
 
-        add_submenu_page('formidable', 'Formidable | ' . __( 'Entries', 'formidable' ), __( 'Entries', 'formidable' ), 'frm_view_entries', 'formidable-entries', 'FrmEntriesController::route' );
+		add_submenu_page('formidable', 'Formidable | ' . __( 'Entries', 'formidable' ), __( 'Entries', 'formidable' ), 'frm_view_entries', 'formidable-entries', 'FrmEntriesController::route' );
 
 		if ( ! in_array( FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ), array( 'edit', 'show' ) ) ) {
 			$menu_name = FrmAppHelper::get_menu_name();
 			add_filter( 'manage_' . sanitize_title( $menu_name ) . '_page_formidable-entries_columns', 'FrmEntriesController::manage_columns' );
 			add_filter( 'get_user_option_manage' . sanitize_title( $menu_name ) . '_page_formidable-entriescolumnshidden', 'FrmEntriesController::hidden_columns' );
 			add_filter( 'manage_' . sanitize_title( $menu_name ) . '_page_formidable-entries_sortable_columns', 'FrmEntriesController::sortable_columns' );
-        }
-    }
+		}
+	}
 
-    /* Display in Back End */
-    public static function route() {
+	/* Display in Back End */
+	public static function route() {
 		$action = FrmAppHelper::get_param( 'frm_action', '', 'get', 'sanitize_title' );
 
-        switch ( $action ) {
-            case 'show':
-            case 'destroy':
-            case 'destroy_all':
-                return self::$action();
+		switch ( $action ) {
+			case 'show':
+			case 'destroy':
+			case 'destroy_all':
+				return self::$action();
 
-            default:
-                do_action( 'frm_entry_action_route', $action );
-                if ( apply_filters( 'frm_entry_stop_action_route', false, $action ) ) {
-                    return;
-                }
+			default:
+				do_action( 'frm_entry_action_route', $action );
+				if ( apply_filters( 'frm_entry_stop_action_route', false, $action ) ) {
+					return;
+				}
 
-                return self::display_list();
-        }
-    }
+				return self::display_list();
+		}
+	}
 
 	public static function contextual_help( $help, $screen_id, $screen ) {
-        // Only add to certain screens. add_help_tab was introduced in WordPress 3.3
-        if ( ! method_exists( $screen, 'add_help_tab' ) ) {
-            return $help;
-        }
+		// Only add to certain screens. add_help_tab was introduced in WordPress 3.3
+		if ( ! method_exists( $screen, 'add_help_tab' ) ) {
+			return $help;
+		}
 
 		$action = FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' );
 		$page = FrmAppHelper::simple_get( 'page', 'sanitize_title' );
 		if ( $page != 'formidable-entries' || ( ! empty( $action ) && $action != 'list' ) ) {
-            return $help;
-        }
+			return $help;
+		}
 
 		unset( $action, $page );
 
-        $screen->add_help_tab( array(
-            'id'      => 'formidable-entries-tab',
-            'title'   => __( 'Overview', 'formidable' ),
+		$screen->add_help_tab( array(
+			'id'      => 'formidable-entries-tab',
+			'title'   => __( 'Overview', 'formidable' ),
 			'content' => '<p>' . esc_html__( 'This screen provides access to all of your entries. You can customize the display of this screen to suit your workflow.', 'formidable' ) . '</p> <p>' . esc_html__( 'Hovering over a row in the entries list will display action links that allow you to manage your entry.', 'formidable' ) . '</p>',
-        ));
+		));
 
-        $screen->set_help_sidebar(
+		$screen->set_help_sidebar(
 			'<p><strong>' . esc_html__( 'For more information:', 'formidable' ) . '</strong></p>' .
 			'<p><a href="' . esc_url( FrmAppHelper::make_affiliate_url( 'https://formidableforms.com/knowledgebase/manage-entries-from-the-back-end/' ) ) . '" target="_blank">' . esc_html__( 'Documentation on Entries', 'formidable' ) . '</a></p>' .
 			'<p><a href="' . esc_url( FrmAppHelper::make_affiliate_url( 'https://formidableforms.com/help-desk/' ) ) . '" target="_blank">' . esc_html__( 'Support', 'formidable' ) . '</a></p>'
-    	);
+		);
 
-        return $help;
-    }
+		return $help;
+	}
 
 	public static function manage_columns( $columns ) {
-        global $frm_vars;
+		global $frm_vars;
 		$form_id = FrmForm::get_current_form_id();
 
 		$columns[ $form_id . '_id' ] = 'ID';
@@ -83,15 +83,15 @@ 
 		$columns[ $form_id . '_updated_at' ] = __( 'Entry update date', 'formidable' );
 		$columns[ $form_id . '_ip' ] = 'IP';
 
-        $frm_vars['cols'] = $columns;
+		$frm_vars['cols'] = $columns;
 
 		$action = FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' );
 		if ( FrmAppHelper::is_admin_page( 'formidable-entries' ) && in_array( $action, array( '', 'list', 'destroy' ) ) ) {
 			add_screen_option( 'per_page', array( 'label' => __( 'Entries', 'formidable' ), 'default' => 20, 'option' => 'formidable_page_formidable_entries_per_page' ) );
-        }
+		}
 
-        return $columns;
-    }
+		return $columns;
+	}
 
 	private static function get_columns_for_form( $form_id, &$columns ) {
 		$form_cols = FrmField::get_all_for_form( $form_id, '', 'include' );
@@ -135,76 +135,76 @@ 
 		$menu_name = FrmAppHelper::get_menu_name();
 		$this_page_name = 'manage' . sanitize_title( $menu_name ) . '_page_formidable-entriescolumnshidden';
 		if ( $meta_key != $this_page_name || $meta_value == $prev_value ) {
-            return $check;
-        }
+			return $check;
+		}
 
 		if ( empty( $prev_value ) ) {
 			$prev_value = get_metadata( 'user', $object_id, $meta_key, true );
 		}
 
-        global $frm_vars;
-        //add a check so we don't create a loop
-        $frm_vars['prev_hidden_cols'] = ( isset($frm_vars['prev_hidden_cols']) && $frm_vars['prev_hidden_cols'] ) ? false : $prev_value;
+		global $frm_vars;
+		//add a check so we don't create a loop
+		$frm_vars['prev_hidden_cols'] = ( isset($frm_vars['prev_hidden_cols']) && $frm_vars['prev_hidden_cols'] ) ? false : $prev_value;
 
-        return $check;
-    }
+		return $check;
+	}
 
-    //add hidden columns back from other forms
+	//add hidden columns back from other forms
 	public static function update_hidden_cols( $meta_id, $object_id, $meta_key, $meta_value ) {
 		$menu_name = FrmAppHelper::get_menu_name();
 		$sanitized = sanitize_title( $menu_name );
 		$this_page_name = 'manage' . $sanitized . '_page_formidable-entriescolumnshidden';
 		if ( $meta_key != $this_page_name ) {
-            return;
-        }
-
-        global $frm_vars;
-        if ( ! isset($frm_vars['prev_hidden_cols']) || ! $frm_vars['prev_hidden_cols'] ) {
-            return; //don't continue if there's no previous value
-        }
-
-        foreach ( $meta_value as $mk => $mv ) {
-            //remove blank values
-            if ( empty( $mv ) ) {
-                unset( $meta_value[ $mk ] );
-            }
-        }
-
-        $cur_form_prefix = reset($meta_value);
-        $cur_form_prefix = explode('_', $cur_form_prefix);
-        $cur_form_prefix = $cur_form_prefix[0];
-        $save = false;
-
-        foreach ( (array) $frm_vars['prev_hidden_cols'] as $prev_hidden ) {
+			return;
+		}
+
+		global $frm_vars;
+		if ( ! isset($frm_vars['prev_hidden_cols']) || ! $frm_vars['prev_hidden_cols'] ) {
+			return; //don't continue if there's no previous value
+		}
+
+		foreach ( $meta_value as $mk => $mv ) {
+			//remove blank values
+			if ( empty( $mv ) ) {
+				unset( $meta_value[ $mk ] );
+			}
+		}
+
+		$cur_form_prefix = reset($meta_value);
+		$cur_form_prefix = explode('_', $cur_form_prefix);
+		$cur_form_prefix = $cur_form_prefix[0];
+		$save = false;
+
+		foreach ( (array) $frm_vars['prev_hidden_cols'] as $prev_hidden ) {
 			if ( empty( $prev_hidden ) || in_array( $prev_hidden, $meta_value ) ) {
-                //don't add blank cols or process included cols
-                continue;
-            }
+				//don't add blank cols or process included cols
+				continue;
+			}
 
 			$form_prefix = explode( '_', $prev_hidden );
-            $form_prefix = $form_prefix[0];
-            if ( $form_prefix == $cur_form_prefix ) {
-                //don't add back columns that are meant to be hidden
-                continue;
-            }
+			$form_prefix = $form_prefix[0];
+			if ( $form_prefix == $cur_form_prefix ) {
+				//don't add back columns that are meant to be hidden
+				continue;
+			}
 
-            $meta_value[] = $prev_hidden;
-            $save = true;
-            unset($form_prefix);
-        }
+			$meta_value[] = $prev_hidden;
+			$save = true;
+			unset($form_prefix);
+		}
 
 		if ( $save ) {
-            $user = wp_get_current_user();
+			$user = wp_get_current_user();
 			update_user_option( $user->ID, $this_page_name, $meta_value, true );
-        }
-    }
+		}
+	}
 
 	public static function save_per_page( $save, $option, $value ) {
-        if ( $option == 'formidable_page_formidable_entries_per_page' ) {
-            $save = (int) $value;
-        }
-        return $save;
-    }
+		if ( $option == 'formidable_page_formidable_entries_per_page' ) {
+			$save = (int) $value;
+		}
+		return $save;
+	}
 
 	public static function sortable_columns() {
 		$form_id = FrmForm::get_current_form_id();
@@ -230,46 +230,46 @@ 
 	}
 
 	public static function hidden_columns( $result ) {
-        global $frm_vars;
+		global $frm_vars;
 
 		$form_id = FrmForm::get_current_form_id();
 
-        $return = false;
-        foreach ( (array) $result as $r ) {
-            if ( ! empty( $r ) ) {
-                $form_prefix = explode( '_', $r );
-                $form_prefix = $form_prefix[0];
+		$return = false;
+		foreach ( (array) $result as $r ) {
+			if ( ! empty( $r ) ) {
+				$form_prefix = explode( '_', $r );
+				$form_prefix = $form_prefix[0];
 
-                if ( (int) $form_prefix == (int) $form_id ) {
-                    $return = true;
-                    break;
-                }
+				if ( (int) $form_prefix == (int) $form_id ) {
+					$return = true;
+					break;
+				}
 
-                unset($form_prefix);
-            }
-        }
+				unset($form_prefix);
+			}
+		}
 
-        if ( $return ) {
+		if ( $return ) {
 			return $result;
 		}
 
-        $i = isset($frm_vars['cols']) ? count($frm_vars['cols']) : 0;
-        $max_columns = 8;
-        if ( $i <= $max_columns ) {
+		$i = isset($frm_vars['cols']) ? count($frm_vars['cols']) : 0;
+		$max_columns = 8;
+		if ( $i <= $max_columns ) {
 			return $result;
 		}
 
-        global $frm_vars;
-        if ( isset($frm_vars['current_form']) && $frm_vars['current_form'] ) {
-            $frm_vars['current_form']->options = maybe_unserialize($frm_vars['current_form']->options);
-        }
+		global $frm_vars;
+		if ( isset($frm_vars['current_form']) && $frm_vars['current_form'] ) {
+			$frm_vars['current_form']->options = maybe_unserialize($frm_vars['current_form']->options);
+		}
 
 		$has_custom_hidden_columns = ( isset( $frm_vars['current_form'] ) && $frm_vars['current_form'] && isset( $frm_vars['current_form']->options['hidden_cols'] ) && ! empty( $frm_vars['current_form']->options['hidden_cols'] ) );
 		if ( $has_custom_hidden_columns ) {
-            $result = $frm_vars['current_form']->options['hidden_cols'];
-        } else {
-            $cols = $frm_vars['cols'];
-            $cols = array_reverse($cols, true);
+			$result = $frm_vars['current_form']->options['hidden_cols'];
+		} else {
+			$cols = $frm_vars['cols'];
+			$cols = array_reverse($cols, true);
 
 			if ( $form_id ) {
 				$result[] = $form_id . '_id';
@@ -277,59 +277,59 @@ 
 			}
 
 			$result[] = $form_id . '_item_key';
-            $i--;
+			$i--;
 
 			foreach ( $cols as $col_key => $col ) {
-                if ( $i > $max_columns ) {
+				if ( $i > $max_columns ) {
 					$result[] = $col_key;
 				}
-                //remove some columns by default
-                $i--;
-                unset($col_key, $col);
-            }
-        }
+				//remove some columns by default
+				$i--;
+				unset($col_key, $col);
+			}
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
 	public static function display_list( $message = '', $errors = array() ) {
-        global $wpdb, $frm_vars;
+		global $wpdb, $frm_vars;
 
 		$form = FrmForm::maybe_get_current_form();
 		$params = FrmForm::get_admin_params( $form );
 
-        if ( $form ) {
-            $params['form'] = $form->id;
-            $frm_vars['current_form'] = $form;
+		if ( $form ) {
+			$params['form'] = $form->id;
+			$frm_vars['current_form'] = $form;
 
 			self::get_delete_form_time( $form, $errors );
 		}
 
-        $table_class = apply_filters( 'frm_entries_list_class', 'FrmEntriesListHelper' );
+		$table_class = apply_filters( 'frm_entries_list_class', 'FrmEntriesListHelper' );
 
-        $wp_list_table = new $table_class( array( 'params' => $params ) );
+		$wp_list_table = new $table_class( array( 'params' => $params ) );
 
-        $pagenum = $wp_list_table->get_pagenum();
+		$pagenum = $wp_list_table->get_pagenum();
 
-        $wp_list_table->prepare_items();
+		$wp_list_table->prepare_items();
 
-        $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-        if ( $pagenum > $total_pages && $total_pages > 0 ) {
+		$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
+		if ( $pagenum > $total_pages && $total_pages > 0 ) {
 			$url = add_query_arg( 'paged', $total_pages );
-            if ( headers_sent() ) {
-                echo FrmAppHelper::js_redirect($url);
-            } else {
-                wp_redirect( esc_url_raw( $url ) );
-            }
-            die();
-        }
-
-        if ( empty($message) && isset($_GET['import-message']) ) {
-            $message = __( 'Your import is complete', 'formidable' );
-        }
+			if ( headers_sent() ) {
+				echo FrmAppHelper::js_redirect($url);
+			} else {
+				wp_redirect( esc_url_raw( $url ) );
+			}
+			die();
+		}
+
+		if ( empty($message) && isset($_GET['import-message']) ) {
+			$message = __( 'Your import is complete', 'formidable' );
+		}
 
 		require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/list.php' );
-    }
+	}
 
 	private static function get_delete_form_time( $form, &$errors ) {
 		if ( 'trash' == $form->status ) {
@@ -339,19 +339,19 @@ 
 		}
 	}
 
-    /* Back End CRUD */
+	/* Back End CRUD */
 	public static function show( $id = 0 ) {
-        FrmAppHelper::permission_check('frm_view_entries');
+		FrmAppHelper::permission_check('frm_view_entries');
 
-        if ( ! $id ) {
+		if ( ! $id ) {
 			$id = FrmAppHelper::get_param( 'id', 0, 'get', 'absint' );
 
-            if ( ! $id ) {
+			if ( ! $id ) {
 				$id = FrmAppHelper::get_param( 'item_id', 0, 'get', 'absint' );
-            }
-        }
+			}
+		}
 
-        $entry = FrmEntry::getOne($id, true);
+		$entry = FrmEntry::getOne($id, true);
 		if ( ! $entry ) {
 			echo '<div id="form_show_entry_page" class="wrap">' .
 				__( 'You are trying to view an entry that does not exist.', 'formidable' ) .
@@ -359,110 +359,110 @@ 
 			return;
 		}
 
-        $data = maybe_unserialize($entry->description);
+		$data = maybe_unserialize($entry->description);
 		if ( ! is_array( $data ) || ! isset( $data['referrer'] ) ) {
 			$data = array( 'referrer' => $data );
 		}
 
 		$fields = FrmField::get_all_for_form( $entry->form_id, '', 'include' );
-        $to_emails = array();
+		$to_emails = array();
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/show.php' );
-    }
+	}
 
-    public static function destroy() {
-        FrmAppHelper::permission_check('frm_delete_entries');
+	public static function destroy() {
+		FrmAppHelper::permission_check('frm_delete_entries');
 
 		$params = FrmForm::get_admin_params();
 
-        if ( isset($params['keep_post']) && $params['keep_post'] ) {
-            //unlink entry from post
-            global $wpdb;
+		if ( isset($params['keep_post']) && $params['keep_post'] ) {
+			//unlink entry from post
+			global $wpdb;
 			$wpdb->update( $wpdb->prefix . 'frm_items', array( 'post_id' => '' ), array( 'id' => $params['id'] ) );
-        }
+		}
 
-        $message = '';
-        if ( FrmEntry::destroy( $params['id'] ) ) {
-            $message = __( 'Entry was Successfully Destroyed', 'formidable' );
-        }
+		$message = '';
+		if ( FrmEntry::destroy( $params['id'] ) ) {
+			$message = __( 'Entry was Successfully Destroyed', 'formidable' );
+		}
 
-        self::display_list( $message );
-    }
+		self::display_list( $message );
+	}
 
-    public static function destroy_all() {
-        if ( ! current_user_can( 'frm_delete_entries' ) ) {
-            $frm_settings = FrmAppHelper::get_settings();
-            wp_die( $frm_settings->admin_permission );
-        }
+	public static function destroy_all() {
+		if ( ! current_user_can( 'frm_delete_entries' ) ) {
+			$frm_settings = FrmAppHelper::get_settings();
+			wp_die( $frm_settings->admin_permission );
+		}
 
-        global $wpdb;
+		global $wpdb;
 		$params = FrmForm::get_admin_params();
-        $message = '';
-        $errors = array();
-        $form_id = (int) $params['form'];
+		$message = '';
+		$errors = array();
+		$form_id = (int) $params['form'];
 
-        if ( $form_id ) {
-            $entry_ids = FrmDb::get_col( 'frm_items', array( 'form_id' => $form_id ) );
+		if ( $form_id ) {
+			$entry_ids = FrmDb::get_col( 'frm_items', array( 'form_id' => $form_id ) );
 			$action = FrmFormAction::get_action_for_form( $form_id, 'wppost', 1 );
 
-            if ( $action ) {
-                // this action takes a while, so only trigger it if there are posts to delete
-                foreach ( $entry_ids as $entry_id ) {
-                    do_action( 'frm_before_destroy_entry', $entry_id );
-                    unset( $entry_id );
-                }
-            }
-
-            $wpdb->query( $wpdb->prepare( "DELETE em.* FROM {$wpdb->prefix}frm_item_metas as em INNER JOIN {$wpdb->prefix}frm_items as e on (em.item_id=e.id) and form_id=%d", $form_id ) );
-            $results = $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}frm_items WHERE form_id=%d", $form_id ) );
-            if ( $results ) {
+			if ( $action ) {
+				// this action takes a while, so only trigger it if there are posts to delete
+				foreach ( $entry_ids as $entry_id ) {
+					do_action( 'frm_before_destroy_entry', $entry_id );
+					unset( $entry_id );
+				}
+			}
+
+			$wpdb->query( $wpdb->prepare( "DELETE em.* FROM {$wpdb->prefix}frm_item_metas as em INNER JOIN {$wpdb->prefix}frm_items as e on (em.item_id=e.id) and form_id=%d", $form_id ) );
+			$results = $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}frm_items WHERE form_id=%d", $form_id ) );
+			if ( $results ) {
 				FrmEntry::clear_cache();
-                $message = __( 'Entries were Successfully Destroyed', 'formidable' );
-            }
-        } else {
-            $errors = __( 'No entries were specified', 'formidable' );
-        }
-
-        self::display_list( $message, $errors );
-    }
-
-    public static function show_form( $id = '', $key = '', $title = false, $description = false ) {
-        _deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::show_form()' );
-        return FrmFormsController::show_form( $id, $key, $title, $description );
-    }
-
-    public static function get_form( $filename, $form, $title, $description ) {
-        _deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::get_form()' );
-        return FrmFormsController::get_form( $form, $title, $description );
-    }
-
-    public static function process_entry( $errors = '', $ajax = false ) {
+				$message = __( 'Entries were Successfully Destroyed', 'formidable' );
+			}
+		} else {
+			$errors = __( 'No entries were specified', 'formidable' );
+		}
+
+		self::display_list( $message, $errors );
+	}
+
+	public static function show_form( $id = '', $key = '', $title = false, $description = false ) {
+		_deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::show_form()' );
+		return FrmFormsController::show_form( $id, $key, $title, $description );
+	}
+
+	public static function get_form( $filename, $form, $title, $description ) {
+		_deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::get_form()' );
+		return FrmFormsController::get_form( $form, $title, $description );
+	}
+
+	public static function process_entry( $errors = '', $ajax = false ) {
 		$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
 		if ( FrmAppHelper::is_admin() || empty( $_POST ) || empty( $form_id ) || ! isset( $_POST['item_key'] ) ) {
-            return;
-        }
+			return;
+		}
 
-        global $frm_vars;
+		global $frm_vars;
 
 		$form = FrmForm::getOne( $form_id );
-        if ( ! $form ) {
-            return;
-        }
+		if ( ! $form ) {
+			return;
+		}
 
 		$params = FrmForm::get_params( $form );
 
-        if ( ! isset( $frm_vars['form_params'] ) ) {
-            $frm_vars['form_params'] = array();
-        }
+		if ( ! isset( $frm_vars['form_params'] ) ) {
+			$frm_vars['form_params'] = array();
+		}
 		$frm_vars['form_params'][ $form->id ] = $params;
 
 		if ( isset( $frm_vars['created_entries'][ $form_id ] ) ) {
-            return;
-        }
+			return;
+		}
 
-        if ( $errors == '' && ! $ajax ) {
+		if ( $errors == '' && ! $ajax ) {
 			$errors = FrmEntryValidate::validate( $_POST );
-        }
+		}
 
 		/**
 		 * Use this filter to add trigger actions and add errors after
@@ -473,39 +473,39 @@ 
 
 		$frm_vars['created_entries'][ $form_id ] = array( 'errors' => $errors );
 
-        if ( empty( $errors ) ) {
+		if ( empty( $errors ) ) {
 			$_POST['frm_skip_cookie'] = 1;
-            if ( $params['action'] == 'create' ) {
+			if ( $params['action'] == 'create' ) {
 				if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) {
 					$frm_vars['created_entries'][ $form_id ]['entry_id'] = FrmEntry::create( $_POST );
-                }
-            }
+				}
+			}
 
-            do_action( 'frm_process_entry', $params, $errors, $form, array( 'ajax' => $ajax ) );
+			do_action( 'frm_process_entry', $params, $errors, $form, array( 'ajax' => $ajax ) );
 			unset( $_POST['frm_skip_cookie'] );
-        }
-    }
-
-    public static function delete_entry_before_redirect( $url, $form, $atts ) {
-        self::_delete_entry( $atts['id'], $form );
-        return $url;
-    }
-
-    //Delete entry if not redirected
-    public static function delete_entry_after_save( $atts ) {
-        self::_delete_entry( $atts['entry_id'], $atts['form'] );
-    }
-
-    private static function _delete_entry( $entry_id, $form ) {
-        if ( ! $form ) {
-            return;
-        }
-
-        $form->options = maybe_unserialize( $form->options );
-        if ( isset( $form->options['no_save'] ) && $form->options['no_save'] ) {
-            FrmEntry::destroy( $entry_id );
-        }
-    }
+		}
+	}
+
+	public static function delete_entry_before_redirect( $url, $form, $atts ) {
+		self::_delete_entry( $atts['id'], $form );
+		return $url;
+	}
+
+	//Delete entry if not redirected
+	public static function delete_entry_after_save( $atts ) {
+		self::_delete_entry( $atts['entry_id'], $atts['form'] );
+	}
+
+	private static function _delete_entry( $entry_id, $form ) {
+		if ( ! $form ) {
+			return;
+		}
+
+		$form->options = maybe_unserialize( $form->options );
+		if ( isset( $form->options['no_save'] ) && $form->options['no_save'] ) {
+			FrmEntry::destroy( $entry_id );
+		}
+	}
 
 	public static function show_entry_shortcode( $atts ) {
 		return FrmEntryFormat::show_entry( $atts );
@@ -517,15 +517,15 @@ 
 	}
 
 	public static function entry_sidebar( $entry ) {
-        $data = maybe_unserialize($entry->description);
-        $date_format = get_option('date_format');
-        $time_format = get_option('time_format');
+		$data = maybe_unserialize($entry->description);
+		$date_format = get_option('date_format');
+		$time_format = get_option('time_format');
 		if ( isset( $data['browser'] ) ) {
 			$browser = FrmEntryFormat::get_browser( $data['browser'] );
 		}
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/sidebar-shared.php' );
-    }
+	}
 
 	/***********************************************************************
 	 * Deprecated Functions

Spacing +47 added lines, -47 removed lines

@@ -5,7 +5,7 @@ 
     public static function menu() {
 		FrmAppHelper::force_capability( 'frm_view_entries' );
 
-        add_submenu_page('formidable', 'Formidable | ' . __( 'Entries', 'formidable' ), __( 'Entries', 'formidable' ), 'frm_view_entries', 'formidable-entries', 'FrmEntriesController::route' );
+        add_submenu_page( 'formidable', 'Formidable | ' . __( 'Entries', 'formidable' ), __( 'Entries', 'formidable' ), 'frm_view_entries', 'formidable-entries', 'FrmEntriesController::route' );
 
 		if ( ! in_array( FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ), array( 'edit', 'show' ) ) ) {
 			$menu_name = FrmAppHelper::get_menu_name();
@@ -53,7 +53,7 @@ 
             'id'      => 'formidable-entries-tab',
             'title'   => __( 'Overview', 'formidable' ),
 			'content' => '<p>' . esc_html__( 'This screen provides access to all of your entries. You can customize the display of this screen to suit your workflow.', 'formidable' ) . '</p> <p>' . esc_html__( 'Hovering over a row in the entries list will display action links that allow you to manage your entry.', 'formidable' ) . '</p>',
-        ));
+        ) );
 
         $screen->set_help_sidebar(
 			'<p><strong>' . esc_html__( 'For more information:', 'formidable' ) . '</strong></p>' .
@@ -68,20 +68,20 @@ 
         global $frm_vars;
 		$form_id = FrmForm::get_current_form_id();
 
-		$columns[ $form_id . '_id' ] = 'ID';
-		$columns[ $form_id . '_item_key' ] = esc_html__( 'Entry Key', 'formidable' );
+		$columns[$form_id . '_id'] = 'ID';
+		$columns[$form_id . '_item_key'] = esc_html__( 'Entry Key', 'formidable' );
 
 		if ( $form_id ) {
 			self::get_columns_for_form( $form_id, $columns );
 		} else {
-			$columns[ $form_id . '_form_id' ] = __( 'Form', 'formidable' );
-			$columns[ $form_id . '_name' ] = __( 'Entry Name', 'formidable' );
-			$columns[ $form_id . '_user_id' ] = __( 'Created By', 'formidable' );
+			$columns[$form_id . '_form_id'] = __( 'Form', 'formidable' );
+			$columns[$form_id . '_name'] = __( 'Entry Name', 'formidable' );
+			$columns[$form_id . '_user_id'] = __( 'Created By', 'formidable' );
 		}
 
-		$columns[ $form_id . '_created_at' ] = __( 'Entry creation date', 'formidable' );
-		$columns[ $form_id . '_updated_at' ] = __( 'Entry update date', 'formidable' );
-		$columns[ $form_id . '_ip' ] = 'IP';
+		$columns[$form_id . '_created_at'] = __( 'Entry creation date', 'formidable' );
+		$columns[$form_id . '_updated_at'] = __( 'Entry update date', 'formidable' );
+		$columns[$form_id . '_ip'] = 'IP';
 
         $frm_vars['cols'] = $columns;
 
@@ -107,14 +107,14 @@ 
 				if ( $sub_form_cols ) {
 					foreach ( $sub_form_cols as $k => $sub_form_col ) {
 						if ( FrmField::is_no_save_field( $sub_form_col->type ) ) {
-							unset( $sub_form_cols[ $k ] );
+							unset( $sub_form_cols[$k] );
 							continue;
 						}
-						$columns[ $form_id . '_' . $sub_form_col->field_key . '-_-' . $form_col->id ] = FrmAppHelper::truncate( $sub_form_col->name, 35 );
-						unset($sub_form_col);
+						$columns[$form_id . '_' . $sub_form_col->field_key . '-_-' . $form_col->id] = FrmAppHelper::truncate( $sub_form_col->name, 35 );
+						unset( $sub_form_col );
 					}
 				}
-				unset($sub_form_cols);
+				unset( $sub_form_cols );
 			} else {
 				$col_id = $form_col->field_key;
 				if ( $form_col->form_id != $form_id ) {
@@ -124,9 +124,9 @@ 
 				$has_separate_value = ! FrmField::is_option_empty( $form_col, 'separate_value' );
 				$is_post_status     = FrmField::is_option_true( $form_col, 'post_field' ) && $form_col->field_options['post_field'] == 'post_status';
 				if ( $has_separate_value && ! $is_post_status ) {
-					$columns[ $form_id . '_frmsep_' . $col_id ] = FrmAppHelper::truncate( $form_col->name, 35 );
+					$columns[$form_id . '_frmsep_' . $col_id] = FrmAppHelper::truncate( $form_col->name, 35 );
 				}
-				$columns[ $form_id . '_' . $col_id ] = FrmAppHelper::truncate( $form_col->name, 35 );
+				$columns[$form_id . '_' . $col_id] = FrmAppHelper::truncate( $form_col->name, 35 );
 			}
 		}
 	}
@@ -144,7 +144,7 @@ 
 
         global $frm_vars;
         //add a check so we don't create a loop
-        $frm_vars['prev_hidden_cols'] = ( isset($frm_vars['prev_hidden_cols']) && $frm_vars['prev_hidden_cols'] ) ? false : $prev_value;
+        $frm_vars['prev_hidden_cols'] = ( isset( $frm_vars['prev_hidden_cols'] ) && $frm_vars['prev_hidden_cols'] ) ? false : $prev_value;
 
         return $check;
     }
@@ -159,19 +159,19 @@ 
         }
 
         global $frm_vars;
-        if ( ! isset($frm_vars['prev_hidden_cols']) || ! $frm_vars['prev_hidden_cols'] ) {
+        if ( ! isset( $frm_vars['prev_hidden_cols'] ) || ! $frm_vars['prev_hidden_cols'] ) {
             return; //don't continue if there's no previous value
         }
 
         foreach ( $meta_value as $mk => $mv ) {
             //remove blank values
             if ( empty( $mv ) ) {
-                unset( $meta_value[ $mk ] );
+                unset( $meta_value[$mk] );
             }
         }
 
-        $cur_form_prefix = reset($meta_value);
-        $cur_form_prefix = explode('_', $cur_form_prefix);
+        $cur_form_prefix = reset( $meta_value );
+        $cur_form_prefix = explode( '_', $cur_form_prefix );
         $cur_form_prefix = $cur_form_prefix[0];
         $save = false;
 
@@ -190,7 +190,7 @@ 
 
             $meta_value[] = $prev_hidden;
             $save = true;
-            unset($form_prefix);
+            unset( $form_prefix );
         }
 
 		if ( $save ) {
@@ -222,7 +222,7 @@ 
 		foreach ( $fields as $field ) {
 			if ( $field->type != 'checkbox' && ( ! isset( $field->field_options['post_field'] ) || $field->field_options['post_field'] == '' ) ) {
 				// Can't sort on checkboxes because they are stored serialized, or post fields
-				$columns[ $form_id . '_' . $field->field_key ] = 'meta_' . $field->id;
+				$columns[$form_id . '_' . $field->field_key] = 'meta_' . $field->id;
 			}
 		}
 
@@ -245,7 +245,7 @@ 
                     break;
                 }
 
-                unset($form_prefix);
+                unset( $form_prefix );
             }
         }
 
@@ -253,15 +253,15 @@ 
 			return $result;
 		}
 
-        $i = isset($frm_vars['cols']) ? count($frm_vars['cols']) : 0;
+        $i = isset( $frm_vars['cols'] ) ? count( $frm_vars['cols'] ) : 0;
         $max_columns = 8;
         if ( $i <= $max_columns ) {
 			return $result;
 		}
 
         global $frm_vars;
-        if ( isset($frm_vars['current_form']) && $frm_vars['current_form'] ) {
-            $frm_vars['current_form']->options = maybe_unserialize($frm_vars['current_form']->options);
+        if ( isset( $frm_vars['current_form'] ) && $frm_vars['current_form'] ) {
+            $frm_vars['current_form']->options = maybe_unserialize( $frm_vars['current_form']->options );
         }
 
 		$has_custom_hidden_columns = ( isset( $frm_vars['current_form'] ) && $frm_vars['current_form'] && isset( $frm_vars['current_form']->options['hidden_cols'] ) && ! empty( $frm_vars['current_form']->options['hidden_cols'] ) );
@@ -269,23 +269,23 @@ 
             $result = $frm_vars['current_form']->options['hidden_cols'];
         } else {
             $cols = $frm_vars['cols'];
-            $cols = array_reverse($cols, true);
+            $cols = array_reverse( $cols, true );
 
 			if ( $form_id ) {
 				$result[] = $form_id . '_id';
-				$i--;
+				$i --;
 			}
 
 			$result[] = $form_id . '_item_key';
-            $i--;
+            $i --;
 
 			foreach ( $cols as $col_key => $col ) {
                 if ( $i > $max_columns ) {
 					$result[] = $col_key;
 				}
                 //remove some columns by default
-                $i--;
-                unset($col_key, $col);
+                $i --;
+                unset( $col_key, $col );
             }
         }
 
@@ -317,14 +317,14 @@ 
         if ( $pagenum > $total_pages && $total_pages > 0 ) {
 			$url = add_query_arg( 'paged', $total_pages );
             if ( headers_sent() ) {
-                echo FrmAppHelper::js_redirect($url);
+                echo FrmAppHelper::js_redirect( $url );
             } else {
                 wp_redirect( esc_url_raw( $url ) );
             }
             die();
         }
 
-        if ( empty($message) && isset($_GET['import-message']) ) {
+        if ( empty( $message ) && isset( $_GET['import-message'] ) ) {
             $message = __( 'Your import is complete', 'formidable' );
         }
 
@@ -341,7 +341,7 @@ 
 
     /* Back End CRUD */
 	public static function show( $id = 0 ) {
-        FrmAppHelper::permission_check('frm_view_entries');
+        FrmAppHelper::permission_check( 'frm_view_entries' );
 
         if ( ! $id ) {
 			$id = FrmAppHelper::get_param( 'id', 0, 'get', 'absint' );
@@ -351,7 +351,7 @@ 
             }
         }
 
-        $entry = FrmEntry::getOne($id, true);
+        $entry = FrmEntry::getOne( $id, true );
 		if ( ! $entry ) {
 			echo '<div id="form_show_entry_page" class="wrap">' .
 				__( 'You are trying to view an entry that does not exist.', 'formidable' ) .
@@ -359,7 +359,7 @@ 
 			return;
 		}
 
-        $data = maybe_unserialize($entry->description);
+        $data = maybe_unserialize( $entry->description );
 		if ( ! is_array( $data ) || ! isset( $data['referrer'] ) ) {
 			$data = array( 'referrer' => $data );
 		}
@@ -371,11 +371,11 @@ 
     }
 
     public static function destroy() {
-        FrmAppHelper::permission_check('frm_delete_entries');
+        FrmAppHelper::permission_check( 'frm_delete_entries' );
 
 		$params = FrmForm::get_admin_params();
 
-        if ( isset($params['keep_post']) && $params['keep_post'] ) {
+        if ( isset( $params['keep_post'] ) && $params['keep_post'] ) {
             //unlink entry from post
             global $wpdb;
 			$wpdb->update( $wpdb->prefix . 'frm_items', array( 'post_id' => '' ), array( 'id' => $params['id'] ) );
@@ -454,9 +454,9 @@ 
         if ( ! isset( $frm_vars['form_params'] ) ) {
             $frm_vars['form_params'] = array();
         }
-		$frm_vars['form_params'][ $form->id ] = $params;
+		$frm_vars['form_params'][$form->id] = $params;
 
-		if ( isset( $frm_vars['created_entries'][ $form_id ] ) ) {
+		if ( isset( $frm_vars['created_entries'][$form_id] ) ) {
             return;
         }
 
@@ -471,13 +471,13 @@ 
 		 */
 		$errors = apply_filters( 'frm_entries_before_create', $errors, $form );
 
-		$frm_vars['created_entries'][ $form_id ] = array( 'errors' => $errors );
+		$frm_vars['created_entries'][$form_id] = array( 'errors' => $errors );
 
         if ( empty( $errors ) ) {
 			$_POST['frm_skip_cookie'] = 1;
             if ( $params['action'] == 'create' ) {
-				if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) {
-					$frm_vars['created_entries'][ $form_id ]['entry_id'] = FrmEntry::create( $_POST );
+				if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][$form_id]['entry_id'] ) ) {
+					$frm_vars['created_entries'][$form_id]['entry_id'] = FrmEntry::create( $_POST );
                 }
             }
 
@@ -517,9 +517,9 @@ 
 	}
 
 	public static function entry_sidebar( $entry ) {
-        $data = maybe_unserialize($entry->description);
-        $date_format = get_option('date_format');
-        $time_format = get_option('time_format');
+        $data = maybe_unserialize( $entry->description );
+        $date_format = get_option( 'date_format' );
+        $time_format = get_option( 'time_format' );
 		if ( isset( $data['browser'] ) ) {
 			$browser = FrmEntryFormat::get_browser( $data['browser'] );
 		}

classes/models/FrmEntryFormat.php

Indentation +3 added lines, -3 removed lines

@@ -196,9 +196,9 @@
 	}
 
 	/**
-	* Flatten multi-dimensional array for multi-file upload fields
-	* @since 2.0.9
-	*/
+	 * Flatten multi-dimensional array for multi-file upload fields
+	 * @since 2.0.9
+	 */
 	public static function flatten_multi_file_upload( $field, &$val ) {
 		if ( $field->type == 'file' && FrmField::is_option_true( $field, 'multiple' ) ) {
 			$val = FrmAppHelper::array_flatten( $val );

Spacing +14 added lines, -14 removed lines

@@ -52,7 +52,7 @@ 
 			if ( ! self::skip_field( $atts, $f ) ) {
 				self::fill_entry_values( $atts, $f, $values );
 			}
-			unset($f);
+			unset( $f );
 		}
 
 		self::fill_entry_user_info( $atts, $values );
@@ -121,7 +121,7 @@ 
 			'type'  => $f->type,
 		);
 
-		$values[ $f->id ] = apply_filters( 'frm_field_shortcodes_for_default_html_email', $field_shortcodes, $f );
+		$values[$f->id] = apply_filters( 'frm_field_shortcodes_for_default_html_email', $field_shortcodes, $f );
 	}
 
 	public static function fill_entry_values( $atts, $f, array &$values ) {
@@ -153,22 +153,22 @@ 
 		self::prepare_field_output( $atts, $val );
 
 		if ( $atts['format'] != 'text' ) {
-			$values[ $f->field_key ] = $val;
+			$values[$f->field_key] = $val;
 			if ( $atts['entry'] && $f->type != 'textarea' ) {
-				$prev_val = maybe_unserialize( $atts['entry']->metas[ $f->id ] );
+				$prev_val = maybe_unserialize( $atts['entry']->metas[$f->id] );
 				if ( $prev_val != $val ) {
-					$values[ $f->field_key . '-value' ] = $prev_val;
+					$values[$f->field_key . '-value'] = $prev_val;
 				}
 			}
 		} else {
-			$values[ $f->id ] = array( 'label' => $f->name, 'val' => $val, 'type' => $f->type );
+			$values[$f->id] = array( 'label' => $f->name, 'val' => $val, 'type' => $f->type );
 		}
 	}
 
 	private static function fill_missing_fields( $atts, &$values ) {
-		if ( $atts['entry'] && ! isset( $atts['entry']->metas[ $atts['field']->id ] ) ) {
+		if ( $atts['entry'] && ! isset( $atts['entry']->metas[$atts['field']->id] ) ) {
 			// In case include_blank is set
-			$atts['entry']->metas[ $atts['field']->id ] = '';
+			$atts['entry']->metas[$atts['field']->id] = '';
 			$atts['entry'] = apply_filters( 'frm_prepare_entry_content', $atts['entry'], array( 'field' => $atts['field'] ) );
 			self::fill_values_from_entry( $atts, $values );
 		}
@@ -181,7 +181,7 @@ 
 	private static function get_field_value( $atts, &$val ) {
 		$f = $atts['field'];
 		if ( $atts['entry'] ) {
-			$prev_val = maybe_unserialize( $atts['entry']->metas[ $f->id ] );
+			$prev_val = maybe_unserialize( $atts['entry']->metas[$f->id] );
 			$meta = array( 'item_id' => $atts['id'], 'field_id' => $f->id, 'meta_value' => $prev_val, 'field_type' => $f->type );
 
 			//This filter applies to the default-message shortcode and frm-show-entry shortcode only
@@ -252,7 +252,7 @@ 
 			return;
 		}
 
-		$data  = self::get_entry_description_data( $atts );
+		$data = self::get_entry_description_data( $atts );
 
 		if ( $atts['default_email'] ) {
 			$atts['entry']->ip = '[ip]';
@@ -339,7 +339,7 @@ 
 		preg_match_all( $pattern, $u_agent, $matches ); // get the matching numbers
 
 		// see how many we have
-		$i = count($matches['browser']);
+		$i = count( $matches['browser'] );
 
 		if ( $i > 1 ) {
 			//we will have two since we are not using 'other' argument yet
@@ -367,7 +367,7 @@ 
 		self::convert_entry_to_content( $values, $atts, $content );
 
 		if ( 'text' == $atts['format'] ) {
-			$content = implode('', $content);
+			$content = implode( '', $content );
 		}
 
 		if ( $atts['clickable'] ) {
@@ -420,11 +420,11 @@ 
 
 		// merge defaults, global settings, and shortcode options
 		foreach ( $default_settings as $key => $setting ) {
-			if ( $atts[ $key ] != '' ) {
+			if ( $atts[$key] != '' ) {
 				continue;
 			}
 
-			$atts[ $key ] = $setting;
+			$atts[$key] = $setting;
 			unset( $key, $setting );
 		}
 	}

classes/models/FrmEmail.php

Spacing +5 added lines, -5 removed lines

@@ -95,7 +95,7 @@ 
 			'entry'     => $this->entry,
 			'form'      => $this->form,
 		);
-		$to     = apply_filters( 'frm_to_email', $to, $values, $this->form->id, $args );
+		$to = apply_filters( 'frm_to_email', $to, $values, $this->form->id, $args );
 
 		$this->to = array_unique( (array) $to );
 
@@ -433,7 +433,7 @@ 
 	 * @return array
 	 */
 	private function package_header() {
-		$header   = array();
+		$header = array();
 
 		if ( ! empty( $this->cc ) ) {
 			$header[] = 'CC: ' . implode( ',', $this->cc );
@@ -546,12 +546,12 @@ 
 					$name = trim( str_replace( $email, '', $val ) );
 				} else {
 					// If user enters a name without an email
-					unset( $recipients[ $key ] );
+					unset( $recipients[$key] );
 					continue;
 				}
 			}
 
-			$recipients[ $key ] = $name . ' <' . $email . '>';
+			$recipients[$key] = $name . ' <' . $email . '>';
 		}
 
 		return $recipients;
@@ -668,7 +668,7 @@ 
 				) );
 
 				// Remove phone number from to addresses
-				unset( $this->to[ $key ] );
+				unset( $this->to[$key] );
 			}
 		}
 	}

classes/models/FrmEntryMeta.php

Doc Comments +1 added lines

@@ -281,6 +281,7 @@
      * @param string|array $where
      * @param string $order_by
      * @param string $limit
+     * @param boolean $unique
      */
 	private static function get_ids_query( $where, $order_by, $limit, $unique, $args, array &$query ) {
         global $wpdb;

Indentation +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 );
 
@@ -34,40 +34,40 @@ 
 			$id = 0;
 		}
 
-        return $id;
-    }
+		return $id;
+	}
 
-    /**
-     * @param string $meta_key
-     */
+	/**
+	 * @param string $meta_key
+	 */
 	public static function update_entry_meta( $entry_id, $field_id, $meta_key = null, $meta_value ) {
-        if ( ! $field_id ) {
-            return false;
-        }
+		if ( ! $field_id ) {
+			return false;
+		}
 
-        global $wpdb;
+		global $wpdb;
 
 		$values = 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 );
@@ -91,39 +91,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
@@ -148,7 +148,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;
@@ -161,130 +161,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 = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, 'get_col');
+		$values = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, 'get_col');
 
-        if ( ! $args['stripslashes'] ) {
-            return $values;
-        }
+		if ( ! $args['stripslashes'] ) {
+			return $values;
+		}
 
 		foreach ( $values as $k => $v ) {
 			$values[ $k ] = maybe_unserialize( $v );
-            unset($k, $v);
-        }
+			unset($k, $v);
+		}
 
-        return stripslashes_deep($values);
-    }
+		return stripslashes_deep($values);
+	}
 
-    /**
-     * @param string $order
-     * @param string $limit
-     */
+	/**
+	 * @param string $order
+	 * @param string $limit
+	 */
 	private static function meta_field_query( $field_id, $order, $limit, $args, array &$query ) {
-        global $wpdb;
-        $query[] = 'SELECT';
-        $query[] = $args['unique'] ? 'DISTINCT(em.meta_value)' : 'em.meta_value';
+		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' .
-            FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+			FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
 
 		$cache_key = 'all_' . maybe_serialize( $where ) . $order_by . $limit;
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_row' : 'get_results'));
+		$results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_row' : 'get_results'));
 
-        if ( ! $results || ! $stripslashes ) {
-            return $results;
-        }
+		if ( ! $results || ! $stripslashes ) {
+			return $results;
+		}
 
-        foreach ( $results as $k => $result ) {
+		foreach ( $results as $k => $result ) {
 			$results[ $k ]->meta_value = stripslashes_deep( maybe_unserialize( $result->meta_value ) );
-            unset($k, $result);
-        }
+			unset($k, $result);
+		}
 
-        return $results;
-    }
+		return $results;
+	}
 
-    public static function getEntryIds( $where = array(), $order_by = '', $limit = '', $unique = true, $args = array() ) {
+	public static function getEntryIds( $where = array(), $order_by = '', $limit = '', $unique = true, $args = array() ) {
 		$defaults = array(
 			'is_draft' => false,
 			'user_id'  => '',
 			'group_by' => '',
 		);
-        $args = wp_parse_args($args, $defaults);
+		$args = wp_parse_args($args, $defaults);
 
-        $query = array();
-        self::get_ids_query($where, $order_by, $limit, $unique, $args, $query );
-        $query = implode(' ', $query);
+		$query = array();
+		self::get_ids_query($where, $order_by, $limit, $unique, $args, $query );
+		$query = implode(' ', $query);
 
 		$cache_key = 'ids_' . maybe_serialize( $where ) . $order_by . 'l' . $limit . 'u' . $unique . maybe_serialize( $args );
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_var' : 'get_col'));
+		$results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_var' : 'get_col'));
 
-        return $results;
-    }
+		return $results;
+	}
 
-    /**
-     * @param string|array $where
-     * @param string $order_by
-     * @param string $limit
-     */
+	/**
+	 * @param string|array $where
+	 * @param string $order_by
+	 * @param string $limit
+	 */
 	private static function get_ids_query( $where, $order_by, $limit, $unique, $args, array &$query ) {
-        global $wpdb;
-        $query[] = 'SELECT';
+		global $wpdb;
+		$query[] = 'SELECT';
 
 		$defaults = array( 'return_parent_id' => false );
 		$args = array_merge( $defaults, $args );
@@ -298,89 +298,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[] = FrmAppHelper::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[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
 
 			if ( $args['group_by'] ) {
 				$query[] = ' GROUP BY ' . sanitize_text_field( $args['group_by'] );
 			}
-            return;
-        }
+			return;
+		}
 
 		$draft_where = '';
 		$user_where = '';
-        if ( ! $args['is_draft'] ) {
+		if ( ! $args['is_draft'] ) {
 			$draft_where = $wpdb->prepare( ' AND e.is_draft=%d', 0 );
-        } else if ( $args['is_draft'] == 1 ) {
+		} else if ( $args['is_draft'] == 1 ) {
 			$draft_where = $wpdb->prepare( ' AND e.is_draft=%d', 1 );
-        }
+		}
 
-        if ( ! empty($args['user_id']) ) {
-            $user_where = $wpdb->prepare(' AND e.user_id=%d', $args['user_id']);
-        }
+		if ( ! 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[] = FrmAppHelper::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' . FrmAppHelper::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);
 		FrmAppHelper::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 );
 
@@ -50,13 +50,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 );
@@ -76,11 +76,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 );
@@ -91,13 +91,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;
         }
 
@@ -111,10 +111,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();
     }
@@ -122,7 +122,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 ) );
     }
 
 	/**
@@ -141,7 +141,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 );
 		}
@@ -159,14 +159,14 @@ 
 			$cached = FrmAppHelper::check_cache( $entry_id, 'frm_entry' );
 		}
 
-		if ( $cached && isset( $cached->metas ) && isset( $cached->metas[ $field_id ] ) ) {
-			$result = $cached->metas[ $field_id ];
-            return stripslashes_deep($result);
+		if ( $cached && isset( $cached->metas ) && isset( $cached->metas[$field_id] ) ) {
+			$result = $cached->metas[$field_id];
+            return stripslashes_deep( $result );
         }
 
 		$get_table = $wpdb->prefix . 'frm_item_metas';
 		$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';
@@ -174,8 +174,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;
     }
@@ -185,22 +185,22 @@ 
         $args = wp_parse_args( $args, $defaults );
 
         $query = array();
-        self::meta_field_query($field_id, $order, $limit, $args, $query);
-        $query = implode(' ', $query);
+        self::meta_field_query( $field_id, $order, $limit, $args, $query );
+        $query = implode( ' ', $query );
 
 		$cache_key = 'entry_metas_for_field_' . $field_id . $order . $limit . maybe_serialize( $args );
-        $values = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, 'get_col');
+        $values = FrmAppHelper::check_cache( $cache_key, 'frm_entry', $query, 'get_col' );
 
         if ( ! $args['stripslashes'] ) {
             return $values;
         }
 
 		foreach ( $values as $k => $v ) {
-			$values[ $k ] = maybe_unserialize( $v );
-            unset($k, $v);
+			$values[$k] = maybe_unserialize( $v );
+            unset( $k, $v );
         }
 
-        return stripslashes_deep($values);
+        return stripslashes_deep( $values );
     }
 
     /**
@@ -217,8 +217,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 );
         }
@@ -228,7 +228,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;
     }
@@ -242,18 +242,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' .
-            FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+            FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
 
 		$cache_key = 'all_' . maybe_serialize( $where ) . $order_by . $limit;
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_row' : 'get_results'));
+        $results = FrmAppHelper::check_cache( $cache_key, 'frm_entry', $query, ( $limit == ' LIMIT 1' ? 'get_row' : 'get_results' ) );
 
         if ( ! $results || ! $stripslashes ) {
             return $results;
         }
 
         foreach ( $results as $k => $result ) {
-			$results[ $k ]->meta_value = stripslashes_deep( maybe_unserialize( $result->meta_value ) );
-            unset($k, $result);
+			$results[$k]->meta_value = stripslashes_deep( maybe_unserialize( $result->meta_value ) );
+            unset( $k, $result );
         }
 
         return $results;
@@ -265,14 +265,14 @@ 
 			'user_id'  => '',
 			'group_by' => '',
 		);
-        $args = wp_parse_args($args, $defaults);
+        $args = wp_parse_args( $args, $defaults );
 
         $query = array();
-        self::get_ids_query($where, $order_by, $limit, $unique, $args, $query );
-        $query = implode(' ', $query);
+        self::get_ids_query( $where, $order_by, $limit, $unique, $args, $query );
+        $query = implode( ' ', $query );
 
 		$cache_key = 'ids_' . maybe_serialize( $where ) . $order_by . 'l' . $limit . 'u' . $unique . maybe_serialize( $args );
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_var' : 'get_col'));
+        $results = FrmAppHelper::check_cache( $cache_key, 'frm_entry', $query, ( $limit == ' LIMIT 1' ? 'get_var' : 'get_col' ) );
 
         return $results;
     }
@@ -298,17 +298,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[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+            $query[] = FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
 
 			if ( $args['group_by'] ) {
 				$query[] = ' GROUP BY ' . sanitize_text_field( $args['group_by'] );
@@ -324,13 +324,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];
@@ -339,12 +339,12 @@ 
         }
 
 		// The query has already been prepared
-		$query[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+		$query[] = FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
     }
 
     public static function search_entry_metas( $search, $field_id = '', $operator ) {
 		$cache_key = 'search_' . maybe_serialize( $search ) . $field_id . $operator;
-        $results = wp_cache_get($cache_key, 'frm_entry');
+        $results = wp_cache_get( $cache_key, 'frm_entry' );
         if ( false !== $results ) {
             return $results;
         }
@@ -367,18 +367,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' . FrmAppHelper::prepend_and_or_where( ' WHERE ', $where );
         } else {
 			if ( $operator == 'LIKE' ) {
                 $search = '%' . $search . '%';
 			}
-            $query = $wpdb->prepare("SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas WHERE meta_value {$operator} %s and field_id = %d", $search, $field_id);
+            $query = $wpdb->prepare( "SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas WHERE meta_value {$operator} %s and field_id = %d", $search, $field_id );
         }
 
-        $results = $wpdb->get_col($query, 0);
+        $results = $wpdb->get_col( $query, 0 );
 		FrmAppHelper::set_cache( $cache_key, $results, 'frm_entry' );
 
         return $results;

classes/models/FrmFieldOption.php

Doc Comments +4 added lines

@@ -31,6 +31,10 @@
 	 */
 	protected $option_label = '';
 
+	/**
+	 * @param string $option_key
+	 * @param string $option
+	 */
 	public function __construct( $option_key, $option, $args = array() ) {
 		$this->option_key = $option_key;
 		$this->option = $option;

classes/models/FrmFieldValueSelector.php

Doc Comments +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
 	/**
 	 * FrmFieldValueSelector constructor
 	 *
-	 * @param int|string $field_id
+	 * @param integer $field_id
 	 */
 	public function __construct( $field_id, $args ) {
 		$this->set_html_name( $args );

classes/models/FrmForm.php

Indentation +324 added lines, -324 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,47 +424,47 @@ 
 		return $count;
 	}
 
-    /**
-     * @return string form name
-     */
-    public static function getName( $id ) {
-        $form = FrmAppHelper::check_cache($id, 'frm_form');
-        if ( $form ) {
-            $r = stripslashes($form->name);
-            return $r;
-        }
-
-        $query_key = is_numeric( $id ) ? 'id' : 'form_key';
-        $r = FrmDb::get_var( 'frm_forms', array( $query_key => $id ), 'name' );
-        $r = stripslashes($r);
-
-        return $r;
-    }
-
-    /**
-     * @param string $key
-     * @return int form id
-     */
+	/**
+	 * @return string form name
+	 */
+	public static function getName( $id ) {
+		$form = FrmAppHelper::check_cache($id, 'frm_form');
+		if ( $form ) {
+			$r = stripslashes($form->name);
+			return $r;
+		}
+
+		$query_key = is_numeric( $id ) ? 'id' : 'form_key';
+		$r = FrmDb::get_var( 'frm_forms', array( $query_key => $id ), 'name' );
+		$r = stripslashes($r);
+
+		return $r;
+	}
+
+	/**
+	 * @param string $key
+	 * @return int form id
+	 */
 	public static function getIdByKey( $key ) {
-        $id = FrmDb::get_var( 'frm_forms', array( 'form_key' => sanitize_title( $key ) ) );
-        return $id;
-    }
-
-    /**
-     * @param int $id
-     * @return string form key
-     */
+		$id = FrmDb::get_var( 'frm_forms', array( 'form_key' => sanitize_title( $key ) ) );
+		return $id;
+	}
+
+	/**
+	 * @param int $id
+	 * @return string form key
+	 */
 	public static function getKeyById( $id ) {
-        $id = (int) $id;
-        $cache = FrmAppHelper::check_cache($id, 'frm_form');
-        if ( $cache ) {
-            return $cache->form_key;
-        }
+		$id = (int) $id;
+		$cache = FrmAppHelper::check_cache($id, 'frm_form');
+		if ( $cache ) {
+			return $cache->form_key;
+		}
 
-        $key = FrmDb::get_var( 'frm_forms', array( 'id' => $id ), 'form_key' );
+		$key = FrmDb::get_var( 'frm_forms', array( 'id' => $id ), 'form_key' );
 
-        return $key;
-    }
+		return $key;
+	}
 
 	/**
 	 * If $form is numeric, get the form object
@@ -477,47 +477,47 @@ 
 		}
 	}
 
-    /**
-     * @return object form
-     */
-    public static function getOne( $id, $blog_id = false ) {
-        global $wpdb;
+	/**
+	 * @return object form
+	 */
+	public static function getOne( $id, $blog_id = false ) {
+		global $wpdb;
 
-        if ( $blog_id && is_multisite() ) {
-            global $wpmuBaseTablePrefix;
+		if ( $blog_id && is_multisite() ) {
+			global $wpmuBaseTablePrefix;
 			$prefix = $wpmuBaseTablePrefix ? $wpmuBaseTablePrefix . $blog_id . '_' : $wpdb->get_blog_prefix( $blog_id );
 
 			$table_name = $prefix . 'frm_forms';
-        } else {
+		} else {
 			$table_name = $wpdb->prefix . 'frm_forms';
-            $cache = wp_cache_get($id, 'frm_form');
-            if ( $cache ) {
-                if ( isset($cache->options) ) {
-                    $cache->options = maybe_unserialize($cache->options);
-                }
+			$cache = wp_cache_get($id, 'frm_form');
+			if ( $cache ) {
+				if ( isset($cache->options) ) {
+					$cache->options = maybe_unserialize($cache->options);
+				}
 
-                return stripslashes_deep($cache);
-            }
-        }
+				return stripslashes_deep($cache);
+			}
+		}
 
-        if ( is_numeric($id) ) {
-            $where = array( 'id' => $id );
-        } else {
-            $where = array( 'form_key' => $id );
-        }
+		if ( is_numeric($id) ) {
+			$where = array( 'id' => $id );
+		} else {
+			$where = array( 'form_key' => $id );
+		}
 
-        $results = FrmDb::get_row( $table_name, $where );
+		$results = FrmDb::get_row( $table_name, $where );
 
-        if ( isset($results->options) ) {
+		if ( isset($results->options) ) {
 			FrmAppHelper::set_cache( $results->id, $results, 'frm_form' );
-            $results->options = maybe_unserialize($results->options);
-        }
-        return stripslashes_deep($results);
-    }
-
-    /**
-     * @return object|array of objects
-     */
+			$results->options = maybe_unserialize($results->options);
+		}
+		return stripslashes_deep($results);
+	}
+
+	/**
+	 * @return object|array of objects
+	 */
 	public static function getAll( $where = array(), $order_by = '', $limit = '' ) {
 		if ( is_array( $where ) && ! empty( $where ) ) {
 			$results = FrmDb::get_results( 'frm_forms', $where, '*', array( 'order_by' => $order_by, 'limit' => $limit ) );
@@ -541,8 +541,8 @@ 
 			$results = reset( $results );
 		}
 
-        return stripslashes_deep($results);
-    }
+		return stripslashes_deep($results);
+	}
 
 	/**
 	 * Get all published forms
@@ -560,47 +560,47 @@ 
 		return $forms;
 	}
 
-    /**
-     * @return int count of forms
-     */
-    public static function get_count() {
-    	global $wpdb;
+	/**
+	 * @return int count of forms
+	 */
+	public static function get_count() {
+		global $wpdb;
 
-    	$cache_key = 'frm_form_counts';
+		$cache_key = 'frm_form_counts';
 
-    	$counts = wp_cache_get( $cache_key, 'frm_form' );
-    	if ( false !== $counts ) {
-    	    return $counts;
-    	}
+		$counts = wp_cache_get( $cache_key, 'frm_form' );
+		if ( false !== $counts ) {
+			return $counts;
+		}
 
-        $results = (array) FrmDb::get_results( 'frm_forms', array( 'or' => 1, 'parent_form_id' => null, 'parent_form_id <' => 0 ), 'status, is_template' );
+		$results = (array) FrmDb::get_results( 'frm_forms', array( 'or' => 1, 'parent_form_id' => null, 'parent_form_id <' => 0 ), 'status, is_template' );
 
 		$statuses = array( 'published', 'draft', 'template', 'trash' );
-    	$counts = array_fill_keys( $statuses, 0 );
+		$counts = array_fill_keys( $statuses, 0 );
 
-    	foreach ( $results as $row ) {
-            if ( 'trash' != $row->status ) {
-    	        if ( $row->is_template ) {
+		foreach ( $results as $row ) {
+			if ( 'trash' != $row->status ) {
+				if ( $row->is_template ) {
 					$counts['template']++;
-    	        } else {
+				} else {
 					$counts['published']++;
-    	        }
-    	    } else {
+				}
+			} else {
 				$counts['trash']++;
-        	}
+			}
 
-    	    if ( 'draft' == $row->status ) {
+			if ( 'draft' == $row->status ) {
 				$counts['draft']++;
-    	    }
+			}
 
-    		unset($row);
-    	}
+			unset($row);
+		}
 
-    	$counts = (object) $counts;
+		$counts = (object) $counts;
 		FrmAppHelper::set_cache( $cache_key, $counts, 'frm_form' );
 
-    	return $counts;
-    }
+		return $counts;
+	}
 
 	/**
 	 * Clear form caching
@@ -613,14 +613,14 @@ 
 		FrmAppHelper::cache_delete_group( 'frm_form' );
 	}
 
-    /**
-     * @return array of errors
-     */
+	/**
+	 * @return array of errors
+	 */
 	public static function validate( $values ) {
-        $errors = array();
+		$errors = array();
 
-        return apply_filters('frm_validate_form', $errors, $values);
-    }
+		return apply_filters('frm_validate_form', $errors, $values);
+	}
 
 	public static function get_params( $form = null ) {
 		global $frm_vars;

Spacing +96 added lines, -96 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 );
@@ -428,15 +428,15 @@ 
      * @return string form name
      */
     public static function getName( $id ) {
-        $form = FrmAppHelper::check_cache($id, 'frm_form');
+        $form = FrmAppHelper::check_cache( $id, 'frm_form' );
         if ( $form ) {
-            $r = stripslashes($form->name);
+            $r = stripslashes( $form->name );
             return $r;
         }
 
         $query_key = is_numeric( $id ) ? 'id' : 'form_key';
         $r = FrmDb::get_var( 'frm_forms', array( $query_key => $id ), 'name' );
-        $r = stripslashes($r);
+        $r = stripslashes( $r );
 
         return $r;
     }
@@ -456,7 +456,7 @@ 
      */
 	public static function getKeyById( $id ) {
         $id = (int) $id;
-        $cache = FrmAppHelper::check_cache($id, 'frm_form');
+        $cache = FrmAppHelper::check_cache( $id, 'frm_form' );
         if ( $cache ) {
             return $cache->form_key;
         }
@@ -490,17 +490,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 );
@@ -508,11 +508,11 @@ 
 
         $results = FrmDb::get_row( $table_name, $where );
 
-        if ( isset($results->options) ) {
+        if ( isset( $results->options ) ) {
 			FrmAppHelper::set_cache( $results->id, $results, 'frm_form' );
-            $results->options = maybe_unserialize($results->options);
+            $results->options = maybe_unserialize( $results->options );
         }
-        return stripslashes_deep($results);
+        return stripslashes_deep( $results );
     }
 
     /**
@@ -541,7 +541,7 @@ 
 			$results = reset( $results );
 		}
 
-        return stripslashes_deep($results);
+        return stripslashes_deep( $results );
     }
 
 	/**
@@ -581,19 +581,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;
@@ -619,7 +619,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 ) {
@@ -631,11 +631,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(
@@ -653,15 +653,15 @@ 
 			//if there are two forms on the same page, make sure not to submit both
 			foreach ( $default_values as $var => $default ) {
 				if ( $var == 'action' ) {
-					$values[ $var ] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
+					$values[$var] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
 				} else {
-					$values[ $var ] = FrmAppHelper::get_param( $var, $default );
+					$values[$var] = FrmAppHelper::get_param( $var, $default );
 				}
 				unset( $var, $default );
 			}
 		} else {
 			foreach ( $default_values as $var => $default ) {
-				$values[ $var ] = $default;
+				$values[$var] = $default;
 				unset( $var, $default );
 			}
 		}
@@ -676,7 +676,7 @@ 
 	public static function list_page_params() {
 		$values = array();
 		foreach ( array( 'template' => 0, 'id' => '', 'paged' => 1, 'form' => '', 'search' => '', 'sort' => '', 'sdir' => '' ) as $var => $default ) {
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default );
+			$values[$var] = FrmAppHelper::get_param( $var, $default );
 		}
 
 		return $values;
@@ -696,7 +696,7 @@ 
 			'field_id' => '', 'search' => '', 'sort' => '', 'sdir' => '', 'fid' => '',
 			'keep_post' => '',
 		) as $var => $default ) {
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default );
+			$values[$var] = FrmAppHelper::get_param( $var, $default );
 		}
 
 		return $values;
@@ -753,7 +753,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;
@@ -763,7 +763,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 ) {
@@ -777,6 +777,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/FrmField.php

Indentation +195 added lines, -195 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 );
 
@@ -175,41 +175,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 );
@@ -224,7 +224,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 );
@@ -238,11 +238,11 @@ 
 
 		FrmAppHelper::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
@@ -258,131 +258,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 = FrmAppHelper::check_cache( $id, 'frm_field', $query, 'get_row', 0 );
+		$results = FrmAppHelper::check_cache( $id, 'frm_field', $query, 'get_row', 0 );
 
-        if ( empty($results) ) {
-            return $results;
-        }
+		if ( empty($results) ) {
+			return $results;
+		}
 
-        if ( is_numeric($id) ) {
+		if ( is_numeric($id) ) {
 			FrmAppHelper::set_cache( $results->field_key, $results, 'frm_field' );
-        } else if ( $results ) {
+		} else if ( $results ) {
 			FrmAppHelper::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 = FrmAppHelper::check_cache( $id, 'frm_field' );
-        if ( $field ) {
-            $type = $field->{$col};
-        } else {
-            $type = FrmDb::get_var( 'frm_fields', array( 'or' => 1, 'id' => $id, 'field_key' => $id ), $col );
-        }
-
-        return $type;
-    }
+	 */
+	public static function get_type( $id, $col = 'type' ) {
+		$field = FrmAppHelper::check_cache( $id, 'frm_field' );
+		if ( $field ) {
+			$type = $field->{$col};
+		} else {
+			$type = FrmDb::get_var( 'frm_fields', array( 'or' => 1, 'id' => $id, 'field_key' => $id ), $col );
+		}
+
+		return $type;
+	}
 
 	public static function get_all_types_in_form( $form_id, $type, $limit = '', $inc_sub = 'exclude' ) {
-        if ( ! $form_id ) {
-            return array();
-        }
+		if ( ! $form_id ) {
+			return array();
+		}
 
 		$results = self::get_fields_from_transients( $form_id, array( 'inc_embed' => $inc_sub, 'inc_repeat' => $inc_sub ) );
 		if ( ! empty( $results ) ) {
-            $fields = array();
-            $count = 0;
-            foreach ( $results as $result ) {
-                if ( $type != $result->type ) {
-                    continue;
-                }
+			$fields = array();
+			$count = 0;
+			foreach ( $results as $result ) {
+				if ( $type != $result->type ) {
+					continue;
+				}
 
 				$fields[ $result->id ] = $result;
-                $count++;
-                if ( $limit == 1 ) {
-                    $fields = $result;
-                    break;
-                }
+				$count++;
+				if ( $limit == 1 ) {
+					$fields = $result;
+					break;
+				}
 
-                if ( ! empty($limit) && $count >= $limit ) {
-                    break;
-                }
+				if ( ! empty($limit) && $count >= $limit ) {
+					break;
+				}
 
-                unset($result);
-            }
-            return stripslashes_deep($fields);
-        }
+				unset($result);
+			}
+			return stripslashes_deep($fields);
+		}
 
-        self::$use_cache = false;
+		self::$use_cache = false;
 
 		$where = array( 'fi.form_id' => (int) $form_id, 'fi.type' => $type );
 		self::maybe_include_repeating_fields( $inc_sub, $where );
 		$results = self::getAll( $where, 'field_order', $limit );
-        self::$use_cache = true;
-        self::include_sub_fields($results, $inc_sub, $type);
+		self::$use_cache = true;
+		self::include_sub_fields($results, $inc_sub, $type);
 
-        return $results;
-    }
+		return $results;
+	}
 
 	public static function get_all_for_form( $form_id, $limit = '', $inc_embed = 'exclude', $inc_repeat = 'include' ) {
-        if ( ! (int) $form_id ) {
-            return array();
-        }
+		if ( ! (int) $form_id ) {
+			return array();
+		}
 
 		$results = self::get_fields_from_transients( $form_id, array( 'inc_embed' => $inc_embed, 'inc_repeat' => $inc_repeat ) );
 		if ( ! empty( $results ) ) {
-            if ( empty($limit) ) {
+			if ( empty($limit) ) {
 				return $results;
-            }
+			}
 
-            $fields = array();
-            $count = 0;
-            foreach ( $results as $result ) {
+			$fields = array();
+			$count = 0;
+			foreach ( $results as $result ) {
 				$fields[ $result->id ] = $result;
-                if ( ! empty($limit) && $count >= $limit ) {
-                    break;
-                }
-            }
+				if ( ! empty($limit) && $count >= $limit ) {
+					break;
+				}
+			}
 
 			return $fields;
-        }
+		}
 
-        self::$use_cache = false;
+		self::$use_cache = false;
 
 		$where = array( 'fi.form_id' => absint( $form_id ) );
 		self::maybe_include_repeating_fields( $inc_repeat, $where );
 		$results = self::getAll( $where, 'field_order', $limit );
 
-        self::$use_cache = true;
+		self::$use_cache = true;
 
 		self::include_sub_fields( $results, $inc_embed, 'all' );
 
-        if ( empty($limit) ) {
+		if ( empty($limit) ) {
 			self::set_field_transient( $results, $form_id, 0, array( 'inc_embed' => $inc_embed, 'inc_repeat' => $inc_repeat ) );
-        }
+		}
 
 		return $results;
-    }
+	}
 
 	/**
-	* If repeating fields should be included, adjust $where accordingly
-	*
-	* @param string $inc_repeat
-	* @param array $where - pass by reference
-	*/
+	 * If repeating fields should be included, adjust $where accordingly
+	 *
+	 * @param string $inc_repeat
+	 * @param array $where - pass by reference
+	 */
 	private static function maybe_include_repeating_fields( $inc_repeat, &$where ) {
 		if ( $inc_repeat == 'include' ) {
 			$form_id = $where['fi.form_id'];
@@ -393,77 +393,77 @@ 
 
 	public static function include_sub_fields( &$results, $inc_embed, $type = 'all' ) {
 		if ( 'include' != $inc_embed || empty( $results ) ) {
-            return;
-        }
+			return;
+		}
 
-        $form_fields = $results;
+		$form_fields = $results;
 		$index_offset = 1;
-        foreach ( $form_fields as $k => $field ) {
-            if ( 'form' != $field->type || ! isset($field->field_options['form_select']) ) {
-                continue;
-            }
-
-            if ( $type == 'all' ) {
-                $sub_fields = self::get_all_for_form( $field->field_options['form_select'] );
-            } else {
-                $sub_fields = self::get_all_types_in_form($field->form_id, $type);
-            }
-
-            if ( ! empty($sub_fields) ) {
+		foreach ( $form_fields as $k => $field ) {
+			if ( 'form' != $field->type || ! isset($field->field_options['form_select']) ) {
+				continue;
+			}
+
+			if ( $type == 'all' ) {
+				$sub_fields = self::get_all_for_form( $field->field_options['form_select'] );
+			} else {
+				$sub_fields = self::get_all_types_in_form($field->form_id, $type);
+			}
+
+			if ( ! empty($sub_fields) ) {
 				$index = $k + $index_offset;
 				$index_offset += count( $sub_fields );
 				array_splice($results, $index, 0, $sub_fields);
-            }
-            unset($field, $sub_fields);
-        }
-    }
+			}
+			unset($field, $sub_fields);
+		}
+	}
 
 	public static function getAll( $where = array(), $order_by = '', $limit = '', $blog_id = false ) {
 		$cache_key = maybe_serialize( $where ) . $order_by . 'l' . $limit . 'b' . $blog_id;
-        if ( self::$use_cache ) {
-            // make sure old cache doesn't get saved as a transient
-            $results = wp_cache_get($cache_key, 'frm_field');
-            if ( false !== $results ) {
-                return stripslashes_deep($results);
-            }
-        }
-
-        global $wpdb;
-
-        if ( $blog_id && is_multisite() ) {
-            global $wpmuBaseTablePrefix;
-            if ( $wpmuBaseTablePrefix ) {
+		if ( self::$use_cache ) {
+			// make sure old cache doesn't get saved as a transient
+			$results = wp_cache_get($cache_key, 'frm_field');
+			if ( false !== $results ) {
+				return stripslashes_deep($results);
+			}
+		}
+
+		global $wpdb;
+
+		if ( $blog_id && is_multisite() ) {
+			global $wpmuBaseTablePrefix;
+			if ( $wpmuBaseTablePrefix ) {
 				$prefix = $wpmuBaseTablePrefix . $blog_id . '_';
-            } else {
-                $prefix = $wpdb->get_blog_prefix( $blog_id );
-            }
+			} else {
+				$prefix = $wpdb->get_blog_prefix( $blog_id );
+			}
 
 			$table_name = $prefix . 'frm_fields';
 			$form_table_name = $prefix . 'frm_forms';
 		} else {
 			$table_name = $wpdb->prefix . 'frm_fields';
 			$form_table_name = $wpdb->prefix . 'frm_forms';
-        }
+		}
 
 		if ( ! empty( $order_by ) && strpos( $order_by, 'ORDER BY' ) === false ) {
 			$order_by = ' ORDER BY ' . $order_by;
 		}
 
-        $limit = FrmAppHelper::esc_limit($limit);
+		$limit = FrmAppHelper::esc_limit($limit);
 
-        $query = "SELECT fi.*, fr.name as form_name  FROM {$table_name} fi LEFT OUTER JOIN {$form_table_name} fr ON fi.form_id=fr.id";
-        $query_type = ( $limit == ' LIMIT 1' || $limit == 1 ) ? 'row' : 'results';
+		$query = "SELECT fi.*, fr.name as form_name  FROM {$table_name} fi LEFT OUTER JOIN {$form_table_name} fr ON fi.form_id=fr.id";
+		$query_type = ( $limit == ' LIMIT 1' || $limit == 1 ) ? 'row' : 'results';
 
-        if ( is_array($where) ) {
-            $results = FrmDb::get_var( $table_name . ' fi LEFT OUTER JOIN ' . $form_table_name . ' fr ON fi.form_id=fr.id', $where, 'fi.*, fr.name as form_name', array( 'order_by' => $order_by, 'limit' => $limit ), '', $query_type );
+		if ( is_array($where) ) {
+			$results = FrmDb::get_var( $table_name . ' fi LEFT OUTER JOIN ' . $form_table_name . ' fr ON fi.form_id=fr.id', $where, 'fi.*, fr.name as form_name', array( 'order_by' => $order_by, 'limit' => $limit ), '', $query_type );
 		} else {
 			// if the query is not an array, then it has already been prepared
-            $query .= FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+			$query .= FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
 
 			$function_name = ( $query_type == 'row' ) ? 'get_row' : 'get_results';
 			$results = $wpdb->$function_name( $query );
-        }
-        unset( $where );
+		}
+		unset( $where );
 
 		self::format_field_results( $results );
 
@@ -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 +72 added lines, -72 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'];
         }
 
@@ -168,8 +168,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] );
 			}
 		}
 
@@ -179,13 +179,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' );
@@ -238,7 +238,7 @@ 
 
 		FrmAppHelper::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 );
         }
@@ -260,16 +260,16 @@ 
 
         global $wpdb;
 
-        $where = is_numeric($id) ? 'id=%d' : 'field_key=%s';
+        $where = is_numeric( $id ) ? 'id=%d' : 'field_key=%s';
 		$query = $wpdb->prepare( 'SELECT * FROM ' . $wpdb->prefix . 'frm_fields WHERE ' . $where, $id );
 
         $results = FrmAppHelper::check_cache( $id, 'frm_field', $query, 'get_row', 0 );
 
-        if ( empty($results) ) {
+        if ( empty( $results ) ) {
             return $results;
         }
 
-        if ( is_numeric($id) ) {
+        if ( is_numeric( $id ) ) {
 			FrmAppHelper::set_cache( $results->field_key, $results, 'frm_field' );
         } else if ( $results ) {
 			FrmAppHelper::set_cache( $results->id, $results, 'frm_field' );
@@ -277,7 +277,7 @@ 
 
 		self::prepare_options( $results );
 
-        return stripslashes_deep($results);
+        return stripslashes_deep( $results );
     }
 
     /**
@@ -310,20 +310,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;
@@ -332,7 +332,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;
     }
@@ -344,15 +344,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;
                 }
             }
@@ -370,7 +370,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 ) );
         }
 
@@ -399,22 +399,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 );
         }
     }
 
@@ -422,9 +422,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 );
             }
         }
 
@@ -449,16 +449,16 @@ 
 			$order_by = ' ORDER BY ' . $order_by;
 		}
 
-        $limit = FrmAppHelper::esc_limit($limit);
+        $limit = FrmAppHelper::esc_limit( $limit );
 
         $query = "SELECT fi.*, fr.name as form_name  FROM {$table_name} fi LEFT OUTER JOIN {$form_table_name} fr ON fi.form_id=fr.id";
         $query_type = ( $limit == ' LIMIT 1' || $limit == 1 ) ? 'row' : 'results';
 
-        if ( is_array($where) ) {
+        if ( is_array( $where ) ) {
             $results = FrmDb::get_var( $table_name . ' fi LEFT OUTER JOIN ' . $form_table_name . ' fr ON fi.form_id=fr.id', $where, 'fi.*, fr.name as form_name', array( 'order_by' => $order_by, 'limit' => $limit ), '', $query_type );
 		} else {
 			// if the query is not an array, then it has already been prepared
-            $query .= FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+            $query .= FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
 
 			$function_name = ( $query_type == 'row' ) ? 'get_row' : 'get_results';
 			$results = $wpdb->$function_name( $query );
@@ -481,9 +481,9 @@ 
 				FrmAppHelper::set_cache( $result->id, $result, 'frm_field' );
 				FrmAppHelper::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 );
 			}
@@ -502,8 +502,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 );
 	}
 
 	/**
@@ -530,7 +530,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 );
 			}
 		}
@@ -556,7 +556,7 @@ 
 				return;
 			}
 
-			$next++;
+			$next ++;
 		}
 	}
 
@@ -586,8 +586,8 @@ 
 			$is_multi_value_field = (
 				$field['type'] == 'checkbox' ||
 				$field['type'] == 'address' ||
-				( $field['type'] == 'data' && isset($field['data_type']) && $field['data_type'] == 'checkbox' ) ||
-				( $field['type'] == 'lookup' && isset($field['data_type']) && $field['data_type'] == 'checkbox' ) ||
+				( $field['type'] == 'data' && isset( $field['data_type'] ) && $field['data_type'] == 'checkbox' ) ||
+				( $field['type'] == 'lookup' && isset( $field['data_type'] ) && $field['data_type'] == 'checkbox' ) ||
 				self::is_multiple_select( $field )
 			);
 
@@ -612,9 +612,9 @@ 
 	 */
 	public static function is_multiple_select( $field ) {
 		if ( is_array( $field ) ) {
-			return self::is_option_true( $field, 'multiple' ) && ( ( $field['type'] == 'select' || ( $field['type'] == 'data' && isset( $field['data_type'] ) && $field['data_type'] == 'select') ) );
+			return self::is_option_true( $field, 'multiple' ) && ( ( $field['type'] == 'select' || ( $field['type'] == 'data' && isset( $field['data_type'] ) && $field['data_type'] == 'select' ) ) );
 		} else {
-			return self::is_option_true( $field, 'multiple' ) && ( ( $field->type == 'select' || ( $field->type == 'data' && isset($field->field_options['data_type'] ) && $field->field_options['data_type'] == 'select') ) );
+			return self::is_option_true( $field, 'multiple' ) && ( ( $field->type == 'select' || ( $field->type == 'data' && isset( $field->field_options['data_type'] ) && $field->field_options['data_type'] == 'select' ) ) );
 		}
 	}
 
@@ -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 $field[ $option ];
+		return $field[$option];
 	}
 
 	public static function get_option_in_object( $field, $option ) {
-		return isset( $field->field_options[ $option ] ) ? $field->field_options[ $option ] : '';
+		return isset( $field->field_options[$option] ) ? $field->field_options[$option] : '';
 	}
 
 	/**

classes/views/frm-entries/new.php

Spacing +3 added lines, -3 removed lines

@@ -1,11 +1,11 @@
-<div class="frm_forms <?php echo FrmFormsHelper::get_form_style_class($values); ?>" id="frm_form_<?php echo esc_attr( $form->id ) ?>_container" <?php echo apply_filters( 'frm_form_attributes', '', $form ); ?>>
+<div class="frm_forms <?php echo FrmFormsHelper::get_form_style_class( $values ); ?>" id="frm_form_<?php echo esc_attr( $form->id ) ?>_container" <?php echo apply_filters( 'frm_form_attributes', '', $form ); ?>>
 <?php
 if ( ! isset( $include_form_tag ) || $include_form_tag ) {
 ?>
-<form enctype="<?php echo esc_attr( apply_filters( 'frm_form_enctype', 'multipart/form-data', $form ) ) ?>" method="post" class="frm-show-form <?php do_action('frm_form_classes', $form) ?>" id="form_<?php echo esc_attr( $form->form_key ) ?>" <?php echo $frm_settings->use_html ? '' : 'action=""'; ?>>
+<form enctype="<?php echo esc_attr( apply_filters( 'frm_form_enctype', 'multipart/form-data', $form ) ) ?>" method="post" class="frm-show-form <?php do_action( 'frm_form_classes', $form ) ?>" id="form_<?php echo esc_attr( $form->form_key ) ?>" <?php echo $frm_settings->use_html ? '' : 'action=""'; ?>>
 <?php
 } else { ?>
-<div id="form_<?php echo esc_attr( $form->form_key ) ?>" class="frm-show-form <?php do_action('frm_form_classes', $form) ?>" >
+<div id="form_<?php echo esc_attr( $form->form_key ) ?>" class="frm-show-form <?php do_action( 'frm_form_classes', $form ) ?>" >
 <?php
 }