Strategy11 / formidable-forms

classes/models/FrmEntry.php

Indentation +398 added lines, -398 removed lines

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

Spacing +87 added lines, -87 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -55,13 +55,13 @@ 
 		unset( $check_val['is_draft'], $check_val['id'], $check_val['item_key'] );
 
         if ( $new_values['item_key'] == $new_values['name'] ) {
-            unset($check_val['name']);
+            unset( $check_val['name'] );
         }
 
         global $wpdb;
 		$entry_exists = FrmDb::get_col( $wpdb->prefix . 'frm_items', $check_val, 'id', array( 'order_by' => 'created_at DESC' ) );
 
-        if ( ! $entry_exists || empty($entry_exists) || ! isset($values['item_meta']) ) {
+        if ( ! $entry_exists || empty( $entry_exists ) || ! isset( $values['item_meta'] ) ) {
             return false;
         }
 
@@ -70,10 +70,10 @@ 
             $is_duplicate = true;
 
             //add more checks here to make sure it's a duplicate
-            $metas = FrmEntryMeta::get_entry_meta_info($entry_exist);
+            $metas = FrmEntryMeta::get_entry_meta_info( $entry_exist );
             $field_metas = array();
             foreach ( $metas as $meta ) {
-				$field_metas[ $meta->field_id ] = $meta->meta_value;
+				$field_metas[$meta->field_id] = $meta->meta_value;
             }
 
             // If prev entry is empty and current entry is not, they are not duplicates
@@ -82,9 +82,9 @@ 
                 return false;
             }
 
-            $diff = array_diff_assoc($field_metas, array_map('maybe_serialize', $values['item_meta']));
+            $diff = array_diff_assoc( $field_metas, array_map( 'maybe_serialize', $values['item_meta'] ) );
             foreach ( $diff as $field_id => $meta_value ) {
-                if ( ! empty($meta_value) ) {
+                if ( ! empty( $meta_value ) ) {
                     $is_duplicate = false;
                     continue;
                 }
@@ -107,9 +107,9 @@ 
 	 * @param int $duplicate_entry_time
 	 * @return bool
 	 */
-	private static function is_duplicate_check_needed( $new_values, $values, &$duplicate_entry_time ){
+	private static function is_duplicate_check_needed( $new_values, $values, &$duplicate_entry_time ) {
 		// If CSV is importing, don't check for duplicates
-		if ( defined('WP_IMPORTING') && WP_IMPORTING ) {
+		if ( defined( 'WP_IMPORTING' ) && WP_IMPORTING ) {
 			return false;
 		}
 
@@ -133,14 +133,14 @@ 
         $values = self::getOne( $id );
 
         $new_values = array();
-        $new_values['item_key'] = FrmAppHelper::get_unique_key('', $wpdb->prefix .'frm_items', 'item_key');
+        $new_values['item_key'] = FrmAppHelper::get_unique_key( '', $wpdb->prefix . 'frm_items', 'item_key' );
         $new_values['name'] = $values->name;
         $new_values['is_draft'] = $values->is_draft;
         $new_values['user_id'] = $new_values['updated_by'] = (int) $values->user_id;
-        $new_values['form_id'] = $values->form_id ? (int) $values->form_id: null;
-        $new_values['created_at'] = $new_values['updated_at'] = current_time('mysql', 1);
+        $new_values['form_id'] = $values->form_id ? (int) $values->form_id : null;
+        $new_values['created_at'] = $new_values['updated_at'] = current_time( 'mysql', 1 );
 
-        $query_results = $wpdb->insert( $wpdb->prefix .'frm_items', $new_values );
+        $query_results = $wpdb->insert( $wpdb->prefix . 'frm_items', $new_values );
         if ( ! $query_results ) {
             return false;
         }
@@ -148,12 +148,12 @@ 
         $entry_id = $wpdb->insert_id;
 
         global $frm_vars;
-        if ( ! isset($frm_vars['saved_entries']) ) {
+        if ( ! isset( $frm_vars['saved_entries'] ) ) {
             $frm_vars['saved_entries'] = array();
         }
         $frm_vars['saved_entries'][] = (int) $entry_id;
 
-        FrmEntryMeta::duplicate_entry_metas($id, $entry_id);
+        FrmEntryMeta::duplicate_entry_metas( $id, $entry_id );
 		self::clear_cache();
 
 		do_action( 'frm_after_duplicate_entry', $entry_id, $new_values['form_id'], array( 'old_id' => $id ) );
@@ -192,7 +192,7 @@ 
 
 		$new_values = self::package_entry_to_update( $id, $values );
 
-		$query_results = $wpdb->update( $wpdb->prefix .'frm_items', $new_values, compact('id') );
+		$query_results = $wpdb->update( $wpdb->prefix . 'frm_items', $new_values, compact( 'id' ) );
 
 		self::after_update_entry( $query_results, $id, $values, $new_values );
 
@@ -209,10 +209,10 @@ 
             return $result;
         }
 
-        do_action('frm_before_destroy_entry', $id, $entry);
+        do_action( 'frm_before_destroy_entry', $id, $entry );
 
-        $wpdb->query( $wpdb->prepare('DELETE FROM ' . $wpdb->prefix .'frm_item_metas WHERE item_id=%d', $id) );
-        $result = $wpdb->query( $wpdb->prepare('DELETE FROM ' . $wpdb->prefix .'frm_items WHERE id=%d', $id) );
+        $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_item_metas WHERE item_id=%d', $id ) );
+        $result = $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_items WHERE id=%d', $id ) );
 
 		self::clear_cache();
 
@@ -221,7 +221,7 @@ 
 
 	public static function &update_form( $id, $value, $form_id ) {
         global $wpdb;
-        $form_id = isset($value) ? $form_id : null;
+        $form_id = isset( $value ) ? $form_id : null;
 		$result = $wpdb->update( $wpdb->prefix . 'frm_items', array( 'form_id' => $form_id ), array( 'id' => $id ) );
 		if ( $result ) {
 			self::clear_cache();
@@ -268,24 +268,24 @@ 
         $query = "SELECT it.*, fr.name as form_name, fr.form_key as form_key FROM {$wpdb->prefix}frm_items it
                   LEFT OUTER JOIN {$wpdb->prefix}frm_forms fr ON it.form_id=fr.id WHERE ";
 
-        $query .= is_numeric($id) ? 'it.id=%d' : 'it.item_key=%s';
+        $query .= is_numeric( $id ) ? 'it.id=%d' : 'it.item_key=%s';
         $query_args = array( $id );
         $query = $wpdb->prepare( $query, $query_args );
 
         if ( ! $meta ) {
-            $entry = FrmAppHelper::check_cache( $id .'_nometa', 'frm_entry', $query, 'get_row' );
-            return stripslashes_deep($entry);
+            $entry = FrmAppHelper::check_cache( $id . '_nometa', 'frm_entry', $query, 'get_row' );
+            return stripslashes_deep( $entry );
         }
 
         $entry = FrmAppHelper::check_cache( $id, 'frm_entry' );
         if ( $entry !== false ) {
-            return stripslashes_deep($entry);
+            return stripslashes_deep( $entry );
         }
 
         $entry = $wpdb->get_row( $query );
-        $entry = self::get_meta($entry);
+        $entry = self::get_meta( $entry );
 
-        return stripslashes_deep($entry);
+        return stripslashes_deep( $entry );
     }
 
 	public static function get_meta( $entry ) {
@@ -301,25 +301,25 @@ 
 		$include_key = apply_filters( 'frm_include_meta_keys', false );
         foreach ( $metas as $meta_val ) {
             if ( $meta_val->item_id == $entry->id ) {
-				$entry->metas[ $meta_val->field_id ] = maybe_unserialize( $meta_val->meta_value );
+				$entry->metas[$meta_val->field_id] = maybe_unserialize( $meta_val->meta_value );
 				if ( $include_key ) {
-					$entry->metas[ $meta_val->field_key ] = $entry->metas[ $meta_val->field_id ];
+					$entry->metas[$meta_val->field_key] = $entry->metas[$meta_val->field_id];
 				}
                  continue;
             }
 
             // include sub entries in an array
-			if ( ! isset( $entry_metas[ $meta_val->field_id ] ) ) {
-				$entry->metas[ $meta_val->field_id ] = array();
+			if ( ! isset( $entry_metas[$meta_val->field_id] ) ) {
+				$entry->metas[$meta_val->field_id] = array();
             }
 
-			$entry->metas[ $meta_val->field_id ][] = maybe_unserialize( $meta_val->meta_value );
+			$entry->metas[$meta_val->field_id][] = maybe_unserialize( $meta_val->meta_value );
 
-            unset($meta_val);
+            unset( $meta_val );
         }
-        unset($metas);
+        unset( $metas );
 
-        wp_cache_set( $entry->id, $entry, 'frm_entry');
+        wp_cache_set( $entry->id, $entry, 'frm_entry' );
 
         return $entry;
     }
@@ -335,28 +335,28 @@ 
             return $exists;
         }
 
-        if ( is_numeric($id) ) {
+        if ( is_numeric( $id ) ) {
             $where = array( 'id' => $id );
         } else {
             $where = array( 'item_key' => $id );
         }
-        $id = FrmDb::get_var( $wpdb->prefix .'frm_items', $where );
+        $id = FrmDb::get_var( $wpdb->prefix . 'frm_items', $where );
 
-        $exists = ($id && $id > 0) ? true : false;
+        $exists = ( $id && $id > 0 ) ? true : false;
         return $exists;
     }
 
     public static function getAll( $where, $order_by = '', $limit = '', $meta = false, $inc_form = true ) {
 		global $wpdb;
 
-        $limit = FrmAppHelper::esc_limit($limit);
+        $limit = FrmAppHelper::esc_limit( $limit );
 
-        $cache_key = maybe_serialize($where) . $order_by . $limit . $inc_form;
-        $entries = wp_cache_get($cache_key, 'frm_entry');
+        $cache_key = maybe_serialize( $where ) . $order_by . $limit . $inc_form;
+        $entries = wp_cache_get( $cache_key, 'frm_entry' );
 
         if ( false === $entries ) {
             $fields = 'it.id, it.item_key, it.name, it.ip, it.form_id, it.post_id, it.user_id, it.parent_item_id, it.updated_by, it.created_at, it.updated_at, it.is_draft';
-            $table = $wpdb->prefix .'frm_items it ';
+            $table = $wpdb->prefix . 'frm_items it ';
 
             if ( $inc_form ) {
                 $fields = 'it.*, fr.name as form_name,fr.form_key as form_key';
@@ -366,15 +366,15 @@ 
             if ( preg_match( '/ meta_([0-9]+)/', $order_by, $order_matches ) ) {
     		    // sort by a requested field
                 $field_id = (int) $order_matches[1];
-				$fields .= ', (SELECT meta_value FROM '. $wpdb->prefix .'frm_item_metas WHERE field_id = '. $field_id .' AND item_id = it.id) as meta_'. $field_id;
+				$fields .= ', (SELECT meta_value FROM ' . $wpdb->prefix . 'frm_item_metas WHERE field_id = ' . $field_id . ' AND item_id = it.id) as meta_' . $field_id;
 				unset( $order_matches, $field_id );
 		    }
 
 			// prepare the query
-			$query = 'SELECT ' . $fields . ' FROM ' . $table . FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+			$query = 'SELECT ' . $fields . ' FROM ' . $table . FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
 
-            $entries = $wpdb->get_results($query, OBJECT_K);
-            unset($query);
+            $entries = $wpdb->get_results( $query, OBJECT_K );
+            unset( $query );
 
 			if ( ! FrmAppHelper::prevent_caching() ) {
 				wp_cache_set( $cache_key, $entries, 'frm_entry', 300 );
@@ -382,16 +382,16 @@ 
         }
 
         if ( ! $meta || ! $entries ) {
-            return stripslashes_deep($entries);
+            return stripslashes_deep( $entries );
         }
-        unset($meta);
+        unset( $meta );
 
-        if ( ! is_array( $where ) && preg_match('/^it\.form_id=\d+$/', $where) ) {
+        if ( ! is_array( $where ) && preg_match( '/^it\.form_id=\d+$/', $where ) ) {
 			$where = array( 'it.form_id' => substr( $where, 11 ) );
         }
 
         $meta_where = array( 'field_id !' => 0 );
-        if ( $limit == '' && is_array($where) && count($where) == 1 && isset($where['it.form_id']) ) {
+        if ( $limit == '' && is_array( $where ) && count( $where ) == 1 && isset( $where['it.form_id'] ) ) {
             $meta_where['fi.form_id'] = $where['it.form_id'];
         } else {
             $meta_where['item_id'] = array_keys( $entries );
@@ -402,21 +402,21 @@ 
         unset( $meta_where );
 
         if ( ! $metas ) {
-            return stripslashes_deep($entries);
+            return stripslashes_deep( $entries );
         }
 
         foreach ( $metas as $m_key => $meta_val ) {
-            if ( ! isset( $entries[ $meta_val->item_id ] ) ) {
+            if ( ! isset( $entries[$meta_val->item_id] ) ) {
                 continue;
             }
 
-            if ( ! isset( $entries[ $meta_val->item_id ]->metas ) ) {
-				$entries[ $meta_val->item_id ]->metas = array();
+            if ( ! isset( $entries[$meta_val->item_id]->metas ) ) {
+				$entries[$meta_val->item_id]->metas = array();
             }
 
-			$entries[ $meta_val->item_id ]->metas[ $meta_val->field_id ] = maybe_unserialize( $meta_val->meta_value );
+			$entries[$meta_val->item_id]->metas[$meta_val->field_id] = maybe_unserialize( $meta_val->meta_value );
 
-            unset($m_key, $meta_val);
+            unset( $m_key, $meta_val );
         }
 
 		if ( ! FrmAppHelper::prevent_caching() ) {
@@ -426,15 +426,15 @@ 
 			}
 		}
 
-        return stripslashes_deep($entries);
+        return stripslashes_deep( $entries );
     }
 
     // Pagination Methods
     public static function getRecordCount( $where = '' ) {
         global $wpdb;
-        $table_join = $wpdb->prefix .'frm_items it LEFT OUTER JOIN '. $wpdb->prefix .'frm_forms fr ON it.form_id=fr.id';
+        $table_join = $wpdb->prefix . 'frm_items it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fr ON it.form_id=fr.id';
 
-        if ( is_numeric($where) ) {
+        if ( is_numeric( $where ) ) {
             $table_join = 'frm_items';
             $where = array( 'form_id' => $where );
         }
@@ -442,19 +442,19 @@ 
         if ( is_array( $where ) ) {
             $count = FrmDb::get_count( $table_join, $where );
         } else {
-            $cache_key = 'count_'. maybe_serialize($where);
-            $query = 'SELECT COUNT(*) FROM '. $table_join . FrmAppHelper::prepend_and_or_where(' WHERE ', $where);
-            $count = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, 'get_var');
+            $cache_key = 'count_' . maybe_serialize( $where );
+            $query = 'SELECT COUNT(*) FROM ' . $table_join . FrmAppHelper::prepend_and_or_where( ' WHERE ', $where );
+            $count = FrmAppHelper::check_cache( $cache_key, 'frm_entry', $query, 'get_var' );
         }
 
         return $count;
     }
 
     public static function getPageCount( $p_size, $where = '' ) {
-        if ( is_numeric($where) ) {
+        if ( is_numeric( $where ) ) {
             return ceil( (int) $where / (int) $p_size );
         } else {
-            return ceil( (int) self::getRecordCount($where) / (int) $p_size );
+            return ceil( (int) self::getRecordCount( $where ) / (int) $p_size );
         }
     }
 
@@ -471,7 +471,7 @@ 
 		self::sanitize_entry_post( $values );
 
 		if ( $type != 'xml' ) {
-			$values = apply_filters('frm_pre_create_entry', $values);
+			$values = apply_filters( 'frm_pre_create_entry', $values );
 		}
 
 		$new_values = self::package_entry_data( $values );
@@ -538,7 +538,7 @@ 
 
 		$item_name = self::get_new_entry_name( $values, $values['item_key'] );
 		$new_values = array(
-			'item_key'  => FrmAppHelper::get_unique_key($values['item_key'], $wpdb->prefix .'frm_items', 'item_key'),
+			'item_key'  => FrmAppHelper::get_unique_key( $values['item_key'], $wpdb->prefix . 'frm_items', 'item_key' ),
 			'name'      => FrmAppHelper::truncate( $item_name, 255, 1, '' ),
 			'ip'        => FrmAppHelper::get_ip_address(),
 			'is_draft'  => self::get_is_draft_value( $values ),
@@ -551,11 +551,11 @@ 
 			'user_id' => self::get_entry_user_id( $values ),
 		);
 
-		if ( is_array($new_values['name']) ) {
-			$new_values['name'] = reset($new_values['name']);
+		if ( is_array( $new_values['name'] ) ) {
+			$new_values['name'] = reset( $new_values['name'] );
 		}
 
-		$new_values['updated_by'] = isset($values['updated_by']) ? $values['updated_by'] : $new_values['user_id'];
+		$new_values['updated_by'] = isset( $values['updated_by'] ) ? $values['updated_by'] : $new_values['user_id'];
 
 		return $new_values;
 	}
@@ -568,7 +568,7 @@ 
 	* @return int
 	*/
 	private static function get_is_draft_value( $values ) {
-		return ( ( isset( $values['frm_saving_draft'] ) && $values['frm_saving_draft'] == 1 ) ||  ( isset( $values['is_draft'] ) && $values['is_draft'] == 1 ) ) ? 1 : 0;
+		return ( ( isset( $values['frm_saving_draft'] ) && $values['frm_saving_draft'] == 1 ) || ( isset( $values['is_draft'] ) && $values['is_draft'] == 1 ) ) ? 1 : 0;
 	}
 
 	/**
@@ -590,7 +590,7 @@ 
 	* @return int
 	*/
 	private static function get_post_id( $values ) {
-		return isset( $values['post_id'] ) ? (int) $values['post_id']: 0;
+		return isset( $values['post_id'] ) ? (int) $values['post_id'] : 0;
 	}
 
 	/**
@@ -601,7 +601,7 @@ 
 	* @return int
 	*/
 	private static function get_parent_item_id( $values ) {
-		return isset( $values['parent_item_id'] ) ? (int) $values['parent_item_id']: 0;
+		return isset( $values['parent_item_id'] ) ? (int) $values['parent_item_id'] : 0;
 	}
 
 	/**
@@ -612,7 +612,7 @@ 
 	* @return string
 	*/
 	private static function get_created_at( $values ) {
-		return isset( $values['created_at'] ) ? $values['created_at']: current_time('mysql', 1);
+		return isset( $values['created_at'] ) ? $values['created_at'] : current_time( 'mysql', 1 );
 	}
 
 	/**
@@ -680,7 +680,7 @@ 
 	private static function insert_entry_into_database( $new_values ) {
 		global $wpdb;
 
-		$query_results = $wpdb->insert( $wpdb->prefix .'frm_items', $new_values );
+		$query_results = $wpdb->insert( $wpdb->prefix . 'frm_items', $new_values );
 
 		if ( ! $query_results ) {
 			$entry_id = false;
@@ -700,7 +700,7 @@ 
 	private static function add_new_entry_to_frm_vars( $entry_id ) {
 		global $frm_vars;
 
-		if ( ! isset($frm_vars['saved_entries']) ) {
+		if ( ! isset( $frm_vars['saved_entries'] ) ) {
 			$frm_vars['saved_entries'] = array();
 		}
 
@@ -715,7 +715,7 @@ 
 	* @param int $entry_id
 	*/
 	private static function maybe_add_entry_metas( $values, $entry_id ) {
-		if ( isset($values['item_meta']) ) {
+		if ( isset( $values['item_meta'] ) ) {
 			FrmEntryMeta::update_entry_metas( $entry_id, $values['item_meta'] );
 		}
 	}
@@ -732,7 +732,7 @@ 
 		$is_child = isset( $values['parent_form_id'] ) && isset( $values['parent_nonce'] ) && ! empty( $values['parent_form_id'] ) && wp_verify_nonce( $values['parent_nonce'], 'parent' );
 
 		do_action( 'frm_after_create_entry', $entry_id, $new_values['form_id'], compact( 'is_child' ) );
-		do_action( 'frm_after_create_entry_'. $new_values['form_id'], $entry_id , compact( 'is_child' ) );
+		do_action( 'frm_after_create_entry_' . $new_values['form_id'], $entry_id, compact( 'is_child' ) );
 	}
 
 	/**
@@ -773,7 +773,7 @@ 
 		}
 
 		if ( $update && $update_type != 'xml' ) {
-			$values = apply_filters('frm_pre_update_entry', $values, $id);
+			$values = apply_filters( 'frm_pre_update_entry', $values, $id );
 		}
 
 		return $update;
@@ -794,27 +794,27 @@ 
 			'name'      => self::get_new_entry_name( $values ),
 			'form_id'   => self::get_form_id( $values ),
 			'is_draft'  => self::get_is_draft_value( $values ),
-			'updated_at' => current_time('mysql', 1),
-			'updated_by' => isset($values['updated_by']) ? $values['updated_by'] : get_current_user_id(),
+			'updated_at' => current_time( 'mysql', 1 ),
+			'updated_by' => isset( $values['updated_by'] ) ? $values['updated_by'] : get_current_user_id(),
 		);
 
-		if ( isset($values['post_id']) ) {
+		if ( isset( $values['post_id'] ) ) {
 			$new_values['post_id'] = (int) $values['post_id'];
 		}
 
-		if ( isset($values['item_key']) ) {
-			$new_values['item_key'] = FrmAppHelper::get_unique_key($values['item_key'], $wpdb->prefix .'frm_items', 'item_key', $id);
+		if ( isset( $values['item_key'] ) ) {
+			$new_values['item_key'] = FrmAppHelper::get_unique_key( $values['item_key'], $wpdb->prefix . 'frm_items', 'item_key', $id );
 		}
 
-		if ( isset($values['parent_item_id']) ) {
+		if ( isset( $values['parent_item_id'] ) ) {
 			$new_values['parent_item_id'] = (int) $values['parent_item_id'];
 		}
 
-		if ( isset($values['frm_user_id']) && is_numeric($values['frm_user_id']) ) {
+		if ( isset( $values['frm_user_id'] ) && is_numeric( $values['frm_user_id'] ) ) {
 			$new_values['user_id'] = $values['frm_user_id'];
 		}
 
-		$new_values = apply_filters('frm_update_entry', $new_values, $id);
+		$new_values = apply_filters( 'frm_update_entry', $new_values, $id );
 
 		return $new_values;
 	}
@@ -844,8 +844,8 @@ 
 			FrmEntryMeta::update_entry_metas( $id, $values['item_meta'] );
 		}
 
-		do_action('frm_after_update_entry', $id, $new_values['form_id'] );
-		do_action('frm_after_update_entry_'. $new_values['form_id'], $id );
+		do_action( 'frm_after_update_entry', $id, $new_values['form_id'] );
+		do_action( 'frm_after_update_entry_' . $new_values['form_id'], $id );
 	}
 
 	/**

Braces +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
 	 * @param int $duplicate_entry_time
 	 * @return bool
 	 */
-	private static function is_duplicate_check_needed( $new_values, $values, &$duplicate_entry_time ){
+	private static function is_duplicate_check_needed( $new_values, $values, &$duplicate_entry_time ) {
 		// If CSV is importing, don't check for duplicates
 		if ( defined('WP_IMPORTING') && WP_IMPORTING ) {
 			return false;

classes/controllers/FrmAppController.php

Indentation +154 added lines, -154 removed lines

@@ -3,14 +3,14 @@ 
 class FrmAppController {
 
 	public static function menu() {
-        FrmAppHelper::maybe_add_permissions();
-        if ( ! current_user_can( 'frm_view_forms' ) ) {
-            return;
-        }
+		FrmAppHelper::maybe_add_permissions();
+		if ( ! current_user_can( 'frm_view_forms' ) ) {
+			return;
+		}
 
 		$menu_name = FrmAppHelper::get_menu_name();
 		add_menu_page( 'Formidable', $menu_name, 'frm_view_forms', 'formidable', 'FrmFormsController::route', FrmAppHelper::plugin_url() . '/images/form_16.png', self::get_menu_position() );
-    }
+	}
 
 	private static function get_menu_position() {
 		$count = count( get_post_types( array( 'show_ui' => true, '_builtin' => false, 'show_in_menu' => true ) ) );
@@ -19,39 +19,39 @@ 
 		return $pos;
 	}
 
-    public static function load_wp_admin_style() {
-        FrmAppHelper::load_font_style();
-    }
+	public static function load_wp_admin_style() {
+		FrmAppHelper::load_font_style();
+	}
 
 	public static function get_form_nav( $form, $show_nav = false, $title = 'show' ) {
-        global $pagenow, $frm_vars;
+		global $pagenow, $frm_vars;
 
 		$show_nav = FrmAppHelper::get_param( 'show_nav', $show_nav, 'get', 'absint' );
-        if ( empty( $show_nav ) ) {
-            return;
-        }
+		if ( empty( $show_nav ) ) {
+			return;
+		}
 
 		$current_page = isset( $_GET['page'] ) ? FrmAppHelper::simple_get( 'page', 'sanitize_title' ) : FrmAppHelper::simple_get( 'post_type', 'sanitize_title', 'None' );
 		if ( $pagenow == 'post.php' || $pagenow == 'post-new.php' ) {
 			$current_page = 'frm_display';
 		}
 
-        if ( $form ) {
+		if ( $form ) {
 			FrmForm::maybe_get_form( $form );
 
-            if ( is_object( $form ) ) {
-                $id = $form->id;
-            }
-        }
+			if ( is_object( $form ) ) {
+				$id = $form->id;
+			}
+		}
 
-        if ( ! isset( $id ) ) {
-            $form = $id = false;
-        }
+		if ( ! isset( $id ) ) {
+			$form = $id = false;
+		}
 
 		$nav_items = self::get_form_nav_items( $id );
 
-        include( FrmAppHelper::plugin_path() . '/classes/views/shared/form-nav.php' );
-    }
+		include( FrmAppHelper::plugin_path() . '/classes/views/shared/form-nav.php' );
+	}
 
 	private static function get_form_nav_items( $id ) {
 		$nav_items = array(
@@ -82,28 +82,28 @@ 
 		return $nav_items;
 	}
 
-    // Adds a settings link to the plugins page
-    public static function settings_link( $links ) {
+	// Adds a settings link to the plugins page
+	public static function settings_link( $links ) {
 		$settings = '<a href="' . esc_url( admin_url( 'admin.php?page=formidable-settings' ) ) . '">' . __( 'Settings', 'formidable' ) . '</a>';
-        array_unshift( $links, $settings );
+		array_unshift( $links, $settings );
 
-        return $links;
-    }
+		return $links;
+	}
 
-    public static function pro_get_started_headline() {
+	public static function pro_get_started_headline() {
 		self::maybe_show_upgrade_bar();
 
-        // Don't display this error as we're upgrading the thing, or if the user shouldn't see the message
-        if ( 'upgrade-plugin' == FrmAppHelper::simple_get( 'action', 'sanitize_title' ) || ! current_user_can( 'update_plugins' ) ) {
-            return;
-        }
+		// Don't display this error as we're upgrading the thing, or if the user shouldn't see the message
+		if ( 'upgrade-plugin' == FrmAppHelper::simple_get( 'action', 'sanitize_title' ) || ! current_user_can( 'update_plugins' ) ) {
+			return;
+		}
 
 		if ( get_site_option( 'frmpro-authorized' ) && ! file_exists( FrmAppHelper::plugin_path() . '/pro/formidable-pro.php' ) ) {
-            FrmAppHelper::load_admin_wide_js();
+			FrmAppHelper::load_admin_wide_js();
 
-            // user is authorized, but running free version
-            $inst_install_url = 'https://formidablepro.com/knowledgebase/install-formidable-forms/';
-        ?>
+			// user is authorized, but running free version
+			$inst_install_url = 'https://formidablepro.com/knowledgebase/install-formidable-forms/';
+		?>
 <div class="error" class="frm_previous_install">
 		<?php
 		echo wp_kses_post( apply_filters( 'frm_pro_update_msg',
@@ -115,8 +115,8 @@ 
 		) ); ?>
 </div>
 <?php
-        }
-    }
+		}
+	}
 
 	private static function maybe_show_upgrade_bar() {
 		$page = FrmAppHelper::simple_get( 'page', 'sanitize_title' );
@@ -216,7 +216,7 @@ 
 		}
 	}
 
-    public static function admin_js() {
+	public static function admin_js() {
 		$version = FrmAppHelper::plugin_version();
 		FrmAppHelper::load_admin_wide_js( false );
 
@@ -227,7 +227,7 @@ 
 			'bootstrap_tooltip', 'bootstrap-multiselect',
 		), $version, true );
 		wp_register_style( 'formidable-admin', FrmAppHelper::plugin_url() . '/css/frm_admin.css', array(), $version );
-        wp_register_script( 'bootstrap_tooltip', FrmAppHelper::plugin_url() . '/js/bootstrap.min.js', array( 'jquery' ), '3.3.4' );
+		wp_register_script( 'bootstrap_tooltip', FrmAppHelper::plugin_url() . '/js/bootstrap.min.js', array( 'jquery' ), '3.3.4' );
 
 		// load multselect js
 		wp_register_script( 'bootstrap-multiselect', FrmAppHelper::plugin_url() . '/js/bootstrap-multiselect.js', array( 'jquery', 'bootstrap_tooltip' ), '0.9.8', true );
@@ -238,79 +238,79 @@ 
 		global $pagenow;
 		if ( strpos( $page, 'formidable' ) === 0 || ( $pagenow == 'edit.php' && $post_type == 'frm_display' ) ) {
 
-            wp_enqueue_script( 'admin-widgets' );
-            wp_enqueue_style( 'widgets' );
-            wp_enqueue_script( 'formidable' );
-            wp_enqueue_script( 'formidable_admin' );
+			wp_enqueue_script( 'admin-widgets' );
+			wp_enqueue_style( 'widgets' );
+			wp_enqueue_script( 'formidable' );
+			wp_enqueue_script( 'formidable_admin' );
 			FrmAppHelper::localize_script( 'admin' );
 
-            wp_enqueue_style( 'formidable-admin' );
+			wp_enqueue_style( 'formidable-admin' );
 			FrmStylesController::enqueue_css( 'admin' );
-            add_thickbox();
+			add_thickbox();
 
-            wp_register_script( 'formidable-editinplace', FrmAppHelper::plugin_url() . '/js/jquery/jquery.editinplace.packed.js', array( 'jquery' ), '2.3.0' );
+			wp_register_script( 'formidable-editinplace', FrmAppHelper::plugin_url() . '/js/jquery/jquery.editinplace.packed.js', array( 'jquery' ), '2.3.0' );
 
-        } else if ( $pagenow == 'post.php' || ( $pagenow == 'post-new.php' && $post_type == 'frm_display' ) ) {
-            if ( isset( $_REQUEST['post_type'] ) ) {
-                $post_type = sanitize_title( $_REQUEST['post_type'] );
+		} else if ( $pagenow == 'post.php' || ( $pagenow == 'post-new.php' && $post_type == 'frm_display' ) ) {
+			if ( isset( $_REQUEST['post_type'] ) ) {
+				$post_type = sanitize_title( $_REQUEST['post_type'] );
 			} else if ( isset( $_REQUEST['post'] ) && absint( $_REQUEST['post'] ) ) {
 				$post = get_post( absint( $_REQUEST['post'] ) );
-                if ( ! $post ) {
-                    return;
-                }
-                $post_type = $post->post_type;
-            } else {
-                return;
-            }
-
-            if ( $post_type == 'frm_display' ) {
-                wp_enqueue_script( 'jquery-ui-draggable' );
-                wp_enqueue_script( 'formidable_admin' );
-                wp_enqueue_style( 'formidable-admin' );
+				if ( ! $post ) {
+					return;
+				}
+				$post_type = $post->post_type;
+			} else {
+				return;
+			}
+
+			if ( $post_type == 'frm_display' ) {
+				wp_enqueue_script( 'jquery-ui-draggable' );
+				wp_enqueue_script( 'formidable_admin' );
+				wp_enqueue_style( 'formidable-admin' );
 				FrmAppHelper::localize_script( 'admin' );
-            }
-        } else if ( $pagenow == 'widgets.php' ) {
-            FrmAppHelper::load_admin_wide_js();
-        }
-    }
-
-    public static function wp_admin_body_class( $classes ) {
-        global $wp_version;
-        //we need this class everywhere in the admin for the menu
-        if ( version_compare( $wp_version, '3.7.2', '>' ) ) {
-            $classes .= ' frm_38_trigger';
-        }
-
-        return $classes;
-    }
-
-    public static function load_lang() {
-        load_plugin_textdomain( 'formidable', false, FrmAppHelper::plugin_folder() . '/languages/' );
-    }
-
-    /**
-     * Filter shortcodes in text widgets
-     */
-    public static function widget_text_filter( $content ) {
-    	$regex = '/\[\s*(formidable|display-frm-data|frm-stats|frm-graph|frm-entry-links|formresults|frm-search)\s+.*\]/';
-    	return preg_replace_callback( $regex, 'FrmAppHelper::widget_text_filter_callback', $content );
-    }
-
-    public static function widget_text_filter_callback( $matches ) {
-        _deprecated_function( __FUNCTION__, '2.0', 'FrmAppHelper::widget_text_filter_callback' );
-        return FrmAppHelper::widget_text_filter_callback( $matches );
-    }
-
-    public static function front_head() {
-        if ( is_multisite() ) {
-            $old_db_version = get_option( 'frm_db_version' );
-            $pro_db_version = FrmAppHelper::pro_is_installed() ? get_option( 'frmpro_db_version' ) : false;
-            if ( ( (int) $old_db_version < (int) FrmAppHelper::$db_version ) ||
-                ( FrmAppHelper::pro_is_installed() && (int) $pro_db_version < (int) FrmAppHelper::$pro_db_version ) ) {
-                self::install( $old_db_version );
-            }
-        }
-    }
+			}
+		} else if ( $pagenow == 'widgets.php' ) {
+			FrmAppHelper::load_admin_wide_js();
+		}
+	}
+
+	public static function wp_admin_body_class( $classes ) {
+		global $wp_version;
+		//we need this class everywhere in the admin for the menu
+		if ( version_compare( $wp_version, '3.7.2', '>' ) ) {
+			$classes .= ' frm_38_trigger';
+		}
+
+		return $classes;
+	}
+
+	public static function load_lang() {
+		load_plugin_textdomain( 'formidable', false, FrmAppHelper::plugin_folder() . '/languages/' );
+	}
+
+	/**
+	 * Filter shortcodes in text widgets
+	 */
+	public static function widget_text_filter( $content ) {
+		$regex = '/\[\s*(formidable|display-frm-data|frm-stats|frm-graph|frm-entry-links|formresults|frm-search)\s+.*\]/';
+		return preg_replace_callback( $regex, 'FrmAppHelper::widget_text_filter_callback', $content );
+	}
+
+	public static function widget_text_filter_callback( $matches ) {
+		_deprecated_function( __FUNCTION__, '2.0', 'FrmAppHelper::widget_text_filter_callback' );
+		return FrmAppHelper::widget_text_filter_callback( $matches );
+	}
+
+	public static function front_head() {
+		if ( is_multisite() ) {
+			$old_db_version = get_option( 'frm_db_version' );
+			$pro_db_version = FrmAppHelper::pro_is_installed() ? get_option( 'frmpro_db_version' ) : false;
+			if ( ( (int) $old_db_version < (int) FrmAppHelper::$db_version ) ||
+				( FrmAppHelper::pro_is_installed() && (int) $pro_db_version < (int) FrmAppHelper::$pro_db_version ) ) {
+				self::install( $old_db_version );
+			}
+		}
+	}
 
 	public static function localize_script( $location ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmAppHelper::localize_script' );
@@ -370,20 +370,20 @@ 
 		wp_die();
 	}
 
-    public static function activation_install() {
-        FrmAppHelper::delete_cache_and_transient( 'frm_plugin_version' );
-        FrmFormActionsController::actions_init();
-        self::install();
-    }
+	public static function activation_install() {
+		FrmAppHelper::delete_cache_and_transient( 'frm_plugin_version' );
+		FrmFormActionsController::actions_init();
+		self::install();
+	}
 
-    public static function install( $old_db_version = false ) {
-        $frmdb = new FrmDb();
-        $frmdb->upgrade( $old_db_version );
-    }
+	public static function install( $old_db_version = false ) {
+		$frmdb = new FrmDb();
+		$frmdb->upgrade( $old_db_version );
+	}
 
-    public static function uninstall() {
+	public static function uninstall() {
 		FrmAppHelper::permission_check('administrator');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$frmdb = new FrmDb();
 		$frmdb->uninstall();
@@ -392,48 +392,48 @@ 
 		deactivate_plugins( FrmAppHelper::plugin_folder() . '/formidable.php', false, false );
 		echo esc_url_raw( admin_url( 'plugins.php?deactivate=true' ) );
 
-        wp_die();
-    }
+		wp_die();
+	}
 
-    public static function drop_tables( $tables ) {
-        global $wpdb;
-        $tables[] = $wpdb->prefix . 'frm_fields';
-        $tables[] = $wpdb->prefix . 'frm_forms';
-        $tables[] = $wpdb->prefix . 'frm_items';
-        $tables[] = $wpdb->prefix . 'frm_item_metas';
-        return $tables;
-    }
+	public static function drop_tables( $tables ) {
+		global $wpdb;
+		$tables[] = $wpdb->prefix . 'frm_fields';
+		$tables[] = $wpdb->prefix . 'frm_forms';
+		$tables[] = $wpdb->prefix . 'frm_items';
+		$tables[] = $wpdb->prefix . 'frm_item_metas';
+		return $tables;
+	}
 
-    // Routes for wordpress pages -- we're just replacing content here folks.
-    public static function page_route( $content ) {
-        global $post;
+	// Routes for wordpress pages -- we're just replacing content here folks.
+	public static function page_route( $content ) {
+		global $post;
 
-        $frm_settings = FrmAppHelper::get_settings();
-        if ( $post && $post->ID == $frm_settings->preview_page_id && isset( $_GET['form'] ) ) {
-            $content = FrmFormsController::page_preview();
-        }
+		$frm_settings = FrmAppHelper::get_settings();
+		if ( $post && $post->ID == $frm_settings->preview_page_id && isset( $_GET['form'] ) ) {
+			$content = FrmFormsController::page_preview();
+		}
 
-        return $content;
-    }
+		return $content;
+	}
 
-    public static function deauthorize() {
+	public static function deauthorize() {
 		FrmAppHelper::permission_check('frm_change_settings');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
-
-        delete_option( 'frmpro-credentials' );
-        delete_option( 'frmpro-authorized' );
-        delete_site_option( 'frmpro-credentials' );
-        delete_site_option( 'frmpro-authorized' );
-        wp_die();
-    }
-
-    public static function get_form_shortcode( $atts ) {
-        _deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::get_form_shortcode()' );
-        return FrmFormsController::get_form_shortcode( $atts );
-    }
-
-    public static function get_postbox_class() {
-        _deprecated_function( __FUNCTION__, '2.0' );
-        return 'postbox-container';
-    }
+		check_ajax_referer( 'frm_ajax', 'nonce' );
+
+		delete_option( 'frmpro-credentials' );
+		delete_option( 'frmpro-authorized' );
+		delete_site_option( 'frmpro-credentials' );
+		delete_site_option( 'frmpro-authorized' );
+		wp_die();
+	}
+
+	public static function get_form_shortcode( $atts ) {
+		_deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::get_form_shortcode()' );
+		return FrmFormsController::get_form_shortcode( $atts );
+	}
+
+	public static function get_postbox_class() {
+		_deprecated_function( __FUNCTION__, '2.0' );
+		return 'postbox-container';
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -135,7 +135,7 @@ 
 <div class="update-nag frm-update-to-pro">
 	<?php echo FrmAppHelper::kses( $tip['tip'] ) ?>
 	<span><?php echo FrmAppHelper::kses( $tip['call'] ) ?></span>
-	<a href="<?php echo esc_url( FrmAppHelper::make_affiliate_url('https://formidablepro.com?banner=1&tip=' . absint( $tip['num'] ) ) ) ?>" class="button">Upgrade to Pro</a>
+	<a href="<?php echo esc_url( FrmAppHelper::make_affiliate_url( 'https://formidablepro.com?banner=1&tip=' . absint( $tip['num'] ) ) ) ?>" class="button">Upgrade to Pro</a>
 </div>
 <?php
 		}
@@ -385,7 +385,7 @@ 
     }
 
     public static function uninstall() {
-		FrmAppHelper::permission_check('administrator');
+		FrmAppHelper::permission_check( 'administrator' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$frmdb = new FrmDb();
@@ -420,7 +420,7 @@ 
     }
 
     public static function deauthorize() {
-		FrmAppHelper::permission_check('frm_change_settings');
+		FrmAppHelper::permission_check( 'frm_change_settings' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
         delete_option( 'frmpro-credentials' );

classes/views/frm-fields/input.php

Indentation +65 added lines, -65 removed lines

@@ -3,48 +3,48 @@ 
 <?php } else if ( $field['type'] == 'textarea' ) { ?>
 <textarea name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id ) ?>" <?php
 if ( $field['max'] ) {
-    echo 'rows="'. esc_attr( $field['max'] ) .'" ';
+	echo 'rows="'. esc_attr( $field['max'] ) .'" ';
 }
 do_action('frm_field_input_html', $field);
 ?>><?php echo FrmAppHelper::esc_textarea($field['value']) ?></textarea>
 <?php
 
 } else if ( $field['type'] == 'radio' ) {
-    $read_only = false;
+	$read_only = false;
 	if ( FrmField::is_read_only( $field ) && ! FrmAppHelper::is_admin() ) {
-        $read_only = true; ?>
+		$read_only = true; ?>
 <input type="hidden" value="<?php echo esc_attr( $field['value'] ) ?>" name="<?php echo esc_attr( $field_name ) ?>" />
 <?php
-    }
+	}
 
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+	if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
 		do_action( 'frm_after_checkbox', array( 'field' => $field, 'field_name' => $field_name, 'type' => $field['type'] ) );
-    } else if ( is_array($field['options']) ) {
-        foreach ( $field['options'] as $opt_key => $opt ) {
+	} else if ( is_array($field['options']) ) {
+		foreach ( $field['options'] as $opt_key => $opt ) {
 			if ( isset( $atts ) && isset( $atts['opt'] ) && ( $atts['opt'] != $opt_key ) ) {
-                continue;
-            }
+				continue;
+			}
 
-            $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-            $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field); ?>
+			$field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
+			$opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field); ?>
 			<div class="<?php echo esc_attr( apply_filters( 'frm_radio_class', 'frm_radio', $field, $field_val ) ) ?>"><?php
 
 			if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
 				?><label for="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>"><?php
-            }
-            $checked = FrmAppHelper::check_selected($field['value'], $field_val) ? 'checked="checked" ' : ' ';
+			}
+			$checked = FrmAppHelper::check_selected($field['value'], $field_val) ? 'checked="checked" ' : ' ';
 
-            $other_opt = false;
-            $other_args = FrmFieldsHelper::prepare_other_input( compact( 'field_name', 'opt_key', 'field' ), $other_opt, $checked );
-            ?>
+			$other_opt = false;
+			$other_args = FrmFieldsHelper::prepare_other_input( compact( 'field_name', 'opt_key', 'field' ), $other_opt, $checked );
+			?>
             <input type="radio" name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id . '-' . $opt_key ) ?>" value="<?php echo esc_attr( $field_val ) ?>" <?php
-            echo $checked;
-            do_action('frm_field_input_html', $field);
+			echo $checked;
+			do_action('frm_field_input_html', $field);
 ?>/><?php
 
 			if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
-                echo ' '. $opt .'</label>';
-            }
+				echo ' '. $opt .'</label>';
+			}
 
 			FrmFieldsHelper::include_other_input( array(
 				'other_opt' => $other_opt, 'read_only' => $read_only,
@@ -53,14 +53,14 @@ 
 				'html_id' => $html_id, 'opt_key' => $opt_key,
 			) );
 
-            unset( $other_opt, $other_args );
+			unset( $other_opt, $other_args );
 ?></div>
 <?php
-        }
-    }
+		}
+	}
 } else if ( $field['type'] == 'select' ) {
-    $read_only = false;
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+	$read_only = false;
+	if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
 		echo FrmFieldsHelper::dropdown_categories( array( 'name' => $field_name, 'field' => $field ) );
 	} else {
 		if ( FrmField::is_read_only( $field ) && ! FrmAppHelper::is_admin() ) {
@@ -93,7 +93,7 @@ 
 			?>
 		<option value="<?php echo esc_attr($field_val) ?>" <?php echo $selected ? ' selected="selected"' : ''; ?><?php echo ( FrmFieldsHelper::is_other_opt( $opt_key ) ) ? ' class="frm_other_trigger"' : '';?>><?php echo ($opt == '') ? ' ' : $opt; ?></option>
     <?php
-    	} ?>
+		} ?>
 </select>
 <?php
 		FrmFieldsHelper::include_other_input( array(
@@ -102,52 +102,52 @@ 
 			'value' => $other_args['value'], 'field' => $field,
 			'html_id' => $html_id, 'opt_key' => false,
 		) );
-    }
+	}
 } else if ( $field['type'] == 'checkbox' ) {
-    $checked_values = $field['value'];
-    $read_only = false;
+	$checked_values = $field['value'];
+	$read_only = false;
 
 	if ( FrmField::is_read_only( $field ) && ! FrmAppHelper::is_admin() ) {
-        $read_only = true;
-        if ( $checked_values ) {
-            foreach ( (array) $checked_values as $checked_value ) { ?>
+		$read_only = true;
+		if ( $checked_values ) {
+			foreach ( (array) $checked_values as $checked_value ) { ?>
 <input type="hidden" value="<?php echo esc_attr( $checked_value ) ?>" name="<?php echo esc_attr( $field_name ) ?>[]" />
 <?php
-            }
-        } else { ?>
+			}
+		} else { ?>
 <input type="hidden" value="" name="<?php echo esc_attr( $field_name ) ?>[]" />
 <?php
-        }
-    }
+		}
+	}
 
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+	if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
 		do_action( 'frm_after_checkbox', array( 'field' => $field, 'field_name' => $field_name, 'type' => $field['type'] ) );
-    } else if ( $field['options'] ) {
-        foreach ( $field['options'] as $opt_key => $opt ) {
-            if ( isset($atts) && isset($atts['opt']) && ($atts['opt'] != $opt_key) ) {
-                continue;
-            }
-
-            $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-            $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
-            $checked = FrmAppHelper::check_selected($checked_values, $field_val) ? ' checked="checked"' : '';
-
-            // Check if other opt, and get values for other field if needed
-            $other_opt = false;
+	} else if ( $field['options'] ) {
+		foreach ( $field['options'] as $opt_key => $opt ) {
+			if ( isset($atts) && isset($atts['opt']) && ($atts['opt'] != $opt_key) ) {
+				continue;
+			}
+
+			$field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
+			$opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
+			$checked = FrmAppHelper::check_selected($checked_values, $field_val) ? ' checked="checked"' : '';
+
+			// Check if other opt, and get values for other field if needed
+			$other_opt = false;
 			$other_args = FrmFieldsHelper::prepare_other_input( compact( 'field', 'field_name', 'opt_key' ), $other_opt, $checked );
 
-            ?>
+			?>
 			<div class="<?php echo esc_attr( apply_filters( 'frm_checkbox_class', 'frm_checkbox', $field, $field_val ) ) ?>" id="frm_checkbox_<?php echo esc_attr( $field['id'] ) ?>-<?php echo esc_attr( $opt_key ) ?>"><?php
 
-            if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
-                ?><label for="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>"><?php
-            }
+			if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
+				?><label for="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>"><?php
+			}
 
-            ?><input type="checkbox" name="<?php echo esc_attr( $field_name ) ?>[<?php echo ( $other_opt ? esc_attr( $opt_key ) : '' ) ?>]" id="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>" value="<?php echo esc_attr( $field_val ) ?>" <?php echo $checked ?> <?php do_action('frm_field_input_html', $field) ?> /><?php
+			?><input type="checkbox" name="<?php echo esc_attr( $field_name ) ?>[<?php echo ( $other_opt ? esc_attr( $opt_key ) : '' ) ?>]" id="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>" value="<?php echo esc_attr( $field_val ) ?>" <?php echo $checked ?> <?php do_action('frm_field_input_html', $field) ?> /><?php
 
-            if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
-                echo ' '. $opt .'</label>';
-            }
+			if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
+				echo ' '. $opt .'</label>';
+			}
 
 			FrmFieldsHelper::include_other_input( array(
 				'other_opt' => $other_opt, 'read_only' => $read_only,
@@ -156,17 +156,17 @@ 
 				'html_id' => $html_id, 'opt_key' => $opt_key,
 			) );
 
-            unset( $other_opt, $other_args, $checked );
+			unset( $other_opt, $other_args, $checked );
 
-            ?></div>
+			?></div>
 <?php
-        }
-    }
+		}
+	}
 } else if ( $field['type'] == 'captcha' && ! FrmAppHelper::is_admin() ) {
-    $frm_settings = FrmAppHelper::get_settings();
-    if ( ! empty($frm_settings->pubkey) ) {
-        FrmFieldsHelper::display_recaptcha($field);
-    }
+	$frm_settings = FrmAppHelper::get_settings();
+	if ( ! empty($frm_settings->pubkey) ) {
+		FrmFieldsHelper::display_recaptcha($field);
+	}
 } else {
 	do_action( 'frm_form_fields', $field, $field_name, compact( 'errors', 'html_id' ) );
 	do_action( 'frm_form_field_' . $field['type'], $field, $field_name, compact( 'errors', 'html_id' ) );

Spacing +25 added lines, -25 removed lines

@@ -1,12 +1,12 @@ 
 <?php if ( in_array( $field['type'], array( 'email', 'url', 'text' ) ) ) { ?>
-<input type="<?php echo ( $frm_settings->use_html || $field['type'] == 'password' ) ? $field['type'] : 'text'; ?>" id="<?php echo esc_attr( $html_id ) ?>" name="<?php echo esc_attr( $field_name ) ?>" value="<?php echo esc_attr( $field['value'] ) ?>" <?php do_action('frm_field_input_html', $field) ?>/>
+<input type="<?php echo ( $frm_settings->use_html || $field['type'] == 'password' ) ? $field['type'] : 'text'; ?>" id="<?php echo esc_attr( $html_id ) ?>" name="<?php echo esc_attr( $field_name ) ?>" value="<?php echo esc_attr( $field['value'] ) ?>" <?php do_action( 'frm_field_input_html', $field ) ?>/>
 <?php } else if ( $field['type'] == 'textarea' ) { ?>
 <textarea name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id ) ?>" <?php
 if ( $field['max'] ) {
-    echo 'rows="'. esc_attr( $field['max'] ) .'" ';
+    echo 'rows="' . esc_attr( $field['max'] ) . '" ';
 }
-do_action('frm_field_input_html', $field);
-?>><?php echo FrmAppHelper::esc_textarea($field['value']) ?></textarea>
+do_action( 'frm_field_input_html', $field );
+?>><?php echo FrmAppHelper::esc_textarea( $field['value'] ) ?></textarea>
 <?php
 
 } else if ( $field['type'] == 'radio' ) {
@@ -17,33 +17,33 @@ 
 <?php
     }
 
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+    if ( isset( $field['post_field'] ) && $field['post_field'] == 'post_category' ) {
 		do_action( 'frm_after_checkbox', array( 'field' => $field, 'field_name' => $field_name, 'type' => $field['type'] ) );
-    } else if ( is_array($field['options']) ) {
+    } else if ( is_array( $field['options'] ) ) {
         foreach ( $field['options'] as $opt_key => $opt ) {
 			if ( isset( $atts ) && isset( $atts['opt'] ) && ( $atts['opt'] != $opt_key ) ) {
                 continue;
             }
 
-            $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-            $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field); ?>
+            $field_val = apply_filters( 'frm_field_value_saved', $opt, $opt_key, $field );
+            $opt = apply_filters( 'frm_field_label_seen', $opt, $opt_key, $field ); ?>
 			<div class="<?php echo esc_attr( apply_filters( 'frm_radio_class', 'frm_radio', $field, $field_val ) ) ?>"><?php
 
 			if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
 				?><label for="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>"><?php
             }
-            $checked = FrmAppHelper::check_selected($field['value'], $field_val) ? 'checked="checked" ' : ' ';
+            $checked = FrmAppHelper::check_selected( $field['value'], $field_val ) ? 'checked="checked" ' : ' ';
 
             $other_opt = false;
             $other_args = FrmFieldsHelper::prepare_other_input( compact( 'field_name', 'opt_key', 'field' ), $other_opt, $checked );
             ?>
             <input type="radio" name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id . '-' . $opt_key ) ?>" value="<?php echo esc_attr( $field_val ) ?>" <?php
             echo $checked;
-            do_action('frm_field_input_html', $field);
+            do_action( 'frm_field_input_html', $field );
 ?>/><?php
 
 			if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
-                echo ' '. $opt .'</label>';
+                echo ' ' . $opt . '</label>';
             }
 
 			FrmFieldsHelper::include_other_input( array(
@@ -60,7 +60,7 @@ 
     }
 } else if ( $field['type'] == 'select' ) {
     $read_only = false;
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+    if ( isset( $field['post_field'] ) && $field['post_field'] == 'post_category' ) {
 		echo FrmFieldsHelper::dropdown_categories( array( 'name' => $field_name, 'field' => $field ) );
 	} else {
 		if ( FrmField::is_read_only( $field ) && ! FrmAppHelper::is_admin() ) {
@@ -71,12 +71,12 @@ 
 					<input type="hidden" value="<?php echo esc_attr( $selected_value ) ?>" name="<?php echo esc_attr( $field_name ) ?>[]" /> <?php
 				}
 			} else { ?>
-				<input type="hidden" value="<?php echo esc_attr($field['value']) ?>" name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id ) ?>" /> <?php
+				<input type="hidden" value="<?php echo esc_attr( $field['value'] ) ?>" name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id ) ?>" /> <?php
 			} ?>
-				<select disabled="disabled" <?php do_action('frm_field_input_html', $field) ?>> <?php
+				<select disabled="disabled" <?php do_action( 'frm_field_input_html', $field ) ?>> <?php
 
 		} else { ?>
-<select name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id ) ?>" <?php do_action('frm_field_input_html', $field) ?>>
+<select name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id ) ?>" <?php do_action( 'frm_field_input_html', $field ) ?>>
 <?php   }
 
 		$other_opt = $other_checked = false;
@@ -91,7 +91,7 @@ 
 				}
 			}
 			?>
-		<option value="<?php echo esc_attr($field_val) ?>" <?php echo $selected ? ' selected="selected"' : ''; ?><?php echo ( FrmFieldsHelper::is_other_opt( $opt_key ) ) ? ' class="frm_other_trigger"' : '';?>><?php echo ($opt == '') ? ' ' : $opt; ?></option>
+		<option value="<?php echo esc_attr( $field_val ) ?>" <?php echo $selected ? ' selected="selected"' : ''; ?><?php echo ( FrmFieldsHelper::is_other_opt( $opt_key ) ) ? ' class="frm_other_trigger"' : ''; ?>><?php echo ( $opt == '' ) ? ' ' : $opt; ?></option>
     <?php
     	} ?>
 </select>
@@ -120,17 +120,17 @@ 
         }
     }
 
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+    if ( isset( $field['post_field'] ) && $field['post_field'] == 'post_category' ) {
 		do_action( 'frm_after_checkbox', array( 'field' => $field, 'field_name' => $field_name, 'type' => $field['type'] ) );
     } else if ( $field['options'] ) {
         foreach ( $field['options'] as $opt_key => $opt ) {
-            if ( isset($atts) && isset($atts['opt']) && ($atts['opt'] != $opt_key) ) {
+            if ( isset( $atts ) && isset( $atts['opt'] ) && ( $atts['opt'] != $opt_key ) ) {
                 continue;
             }
 
-            $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-            $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
-            $checked = FrmAppHelper::check_selected($checked_values, $field_val) ? ' checked="checked"' : '';
+            $field_val = apply_filters( 'frm_field_value_saved', $opt, $opt_key, $field );
+            $opt = apply_filters( 'frm_field_label_seen', $opt, $opt_key, $field );
+            $checked = FrmAppHelper::check_selected( $checked_values, $field_val ) ? ' checked="checked"' : '';
 
             // Check if other opt, and get values for other field if needed
             $other_opt = false;
@@ -143,10 +143,10 @@ 
                 ?><label for="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>"><?php
             }
 
-            ?><input type="checkbox" name="<?php echo esc_attr( $field_name ) ?>[<?php echo ( $other_opt ? esc_attr( $opt_key ) : '' ) ?>]" id="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>" value="<?php echo esc_attr( $field_val ) ?>" <?php echo $checked ?> <?php do_action('frm_field_input_html', $field) ?> /><?php
+            ?><input type="checkbox" name="<?php echo esc_attr( $field_name ) ?>[<?php echo ( $other_opt ? esc_attr( $opt_key ) : '' ) ?>]" id="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>" value="<?php echo esc_attr( $field_val ) ?>" <?php echo $checked ?> <?php do_action( 'frm_field_input_html', $field ) ?> /><?php
 
             if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
-                echo ' '. $opt .'</label>';
+                echo ' ' . $opt . '</label>';
             }
 
 			FrmFieldsHelper::include_other_input( array(
@@ -164,8 +164,8 @@ 
     }
 } else if ( $field['type'] == 'captcha' && ! FrmAppHelper::is_admin() ) {
     $frm_settings = FrmAppHelper::get_settings();
-    if ( ! empty($frm_settings->pubkey) ) {
-        FrmFieldsHelper::display_recaptcha($field);
+    if ( ! empty( $frm_settings->pubkey ) ) {
+        FrmFieldsHelper::display_recaptcha( $field );
     }
 } else {
 	do_action( 'frm_form_fields', $field, $field_name, compact( 'errors', 'html_id' ) );

classes/helpers/FrmFieldsHelper.php

Indentation +814 added lines, -814 removed lines

@@ -7,71 +7,71 @@ 
 
 	public static function setup_new_vars( $type = '', $form_id = '' ) {
 
-        if ( strpos($type, '|') ) {
-            list($type, $setting) = explode('|', $type);
-        }
-
-        $defaults = self::get_default_field_opts($type, $form_id);
-        $defaults['field_options']['custom_html'] = self::get_default_html($type);
-
-        $values = array();
-
-        foreach ( $defaults as $var => $default ) {
-            if ( $var == 'field_options' ) {
-                $values['field_options'] = array();
-                foreach ( $default as $opt_var => $opt_default ) {
-                    $values['field_options'][ $opt_var ] = $opt_default;
-                    unset($opt_var, $opt_default);
-                }
-            } else {
-                $values[ $var ] = $default;
-            }
-            unset($var, $default);
-        }
-
-        if ( isset( $setting ) && ! empty( $setting ) ) {
-            if ( 'data' == $type ) {
-                $values['field_options']['data_type'] = $setting;
-            } else {
-                $values['field_options'][ $setting ] = 1;
-            }
-        }
-
-        if ( $type == 'radio' || $type == 'checkbox' ) {
-            $values['options'] = serialize( array(
-                __( 'Option 1', 'formidable' ),
-                __( 'Option 2', 'formidable' ),
-            ) );
-        } else if ( $type == 'select' ) {
-            $values['options'] = serialize( array(
-                '', __( 'Option 1', 'formidable' ),
-            ) );
-        } else if ( $type == 'textarea' ) {
-            $values['field_options']['max'] = '5';
-        } else if ( $type == 'captcha' ) {
-            $frm_settings = FrmAppHelper::get_settings();
-            $values['invalid'] = $frm_settings->re_msg;
-        } else if ( 'url' == $type ) {
-            $values['name'] = __( 'Website', 'formidable' );
-        }
+		if ( strpos($type, '|') ) {
+			list($type, $setting) = explode('|', $type);
+		}
+
+		$defaults = self::get_default_field_opts($type, $form_id);
+		$defaults['field_options']['custom_html'] = self::get_default_html($type);
+
+		$values = array();
+
+		foreach ( $defaults as $var => $default ) {
+			if ( $var == 'field_options' ) {
+				$values['field_options'] = array();
+				foreach ( $default as $opt_var => $opt_default ) {
+					$values['field_options'][ $opt_var ] = $opt_default;
+					unset($opt_var, $opt_default);
+				}
+			} else {
+				$values[ $var ] = $default;
+			}
+			unset($var, $default);
+		}
+
+		if ( isset( $setting ) && ! empty( $setting ) ) {
+			if ( 'data' == $type ) {
+				$values['field_options']['data_type'] = $setting;
+			} else {
+				$values['field_options'][ $setting ] = 1;
+			}
+		}
+
+		if ( $type == 'radio' || $type == 'checkbox' ) {
+			$values['options'] = serialize( array(
+				__( 'Option 1', 'formidable' ),
+				__( 'Option 2', 'formidable' ),
+			) );
+		} else if ( $type == 'select' ) {
+			$values['options'] = serialize( array(
+				'', __( 'Option 1', 'formidable' ),
+			) );
+		} else if ( $type == 'textarea' ) {
+			$values['field_options']['max'] = '5';
+		} else if ( $type == 'captcha' ) {
+			$frm_settings = FrmAppHelper::get_settings();
+			$values['invalid'] = $frm_settings->re_msg;
+		} else if ( 'url' == $type ) {
+			$values['name'] = __( 'Website', 'formidable' );
+		}
 
 		$fields = FrmField::field_selection();
-        $fields = array_merge($fields, FrmField::pro_field_selection());
+		$fields = array_merge($fields, FrmField::pro_field_selection());
 
-        if ( isset( $fields[ $type ] ) ) {
-            $values['name'] = is_array( $fields[ $type ] ) ? $fields[ $type ]['name'] : $fields[ $type ];
-        }
+		if ( isset( $fields[ $type ] ) ) {
+			$values['name'] = is_array( $fields[ $type ] ) ? $fields[ $type ]['name'] : $fields[ $type ];
+		}
 
-        unset($fields);
+		unset($fields);
 
-        return $values;
-    }
+		return $values;
+	}
 
 	public static function get_html_id( $field, $plus = '' ) {
-        return apply_filters('frm_field_html_id', 'field_'. $field['field_key'] . $plus, $field);
-    }
+		return apply_filters('frm_field_html_id', 'field_'. $field['field_key'] . $plus, $field);
+	}
 
-    public static function setup_edit_vars( $record, $doing_ajax = false ) {
+	public static function setup_edit_vars( $record, $doing_ajax = false ) {
 		$values = array( 'id' => $record->id, 'form_id' => $record->form_id );
 		$defaults = array(
 			'name'          => $record->name,
@@ -84,86 +84,86 @@ 
 		);
 
 		if ( $doing_ajax ) {
-            $values = $values + $defaults;
-            $values['form_name'] = '';
+			$values = $values + $defaults;
+			$values['form_name'] = '';
 		} else {
 			foreach ( $defaults as $var => $default ) {
-                $values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'htmlspecialchars' );
-                unset($var, $default);
-            }
+				$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'htmlspecialchars' );
+				unset($var, $default);
+			}
 
 			$values['form_name'] = $record->form_id ? FrmForm::getName( $record->form_id ) : '';
-        }
+		}
 
 		unset( $defaults );
 
-        $values['options'] = $record->options;
-        $values['field_options'] = $record->field_options;
+		$values['options'] = $record->options;
+		$values['field_options'] = $record->field_options;
 
-        $defaults = self::get_default_field_opts($values['type'], $record, true);
+		$defaults = self::get_default_field_opts($values['type'], $record, true);
 
 		if ( $values['type'] == 'captcha' ) {
-            $frm_settings = FrmAppHelper::get_settings();
-            $defaults['invalid'] = $frm_settings->re_msg;
-        }
+			$frm_settings = FrmAppHelper::get_settings();
+			$defaults['invalid'] = $frm_settings->re_msg;
+		}
 
 		foreach ( $defaults as $opt => $default ) {
-            $values[ $opt ] = isset( $record->field_options[ $opt ] ) ? $record->field_options[ $opt ] : $default;
-            unset($opt, $default);
-        }
+			$values[ $opt ] = isset( $record->field_options[ $opt ] ) ? $record->field_options[ $opt ] : $default;
+			unset($opt, $default);
+		}
 
-        $values['custom_html'] = (isset($record->field_options['custom_html'])) ? $record->field_options['custom_html'] : self::get_default_html($record->type);
+		$values['custom_html'] = (isset($record->field_options['custom_html'])) ? $record->field_options['custom_html'] : self::get_default_html($record->type);
 
 		return apply_filters( 'frm_setup_edit_field_vars', $values, array( 'doing_ajax' => $doing_ajax ) );
-    }
+	}
 
-    public static function get_default_field_opts( $type, $field, $limit = false ) {
-        $field_options = array(
-            'size' => '', 'max' => '', 'label' => '', 'blank' => '',
-            'required_indicator' => '*', 'invalid' => '', 'separate_value' => 0,
-            'clear_on_focus' => 0, 'default_blank' => 0, 'classes' => '',
+	public static function get_default_field_opts( $type, $field, $limit = false ) {
+		$field_options = array(
+			'size' => '', 'max' => '', 'label' => '', 'blank' => '',
+			'required_indicator' => '*', 'invalid' => '', 'separate_value' => 0,
+			'clear_on_focus' => 0, 'default_blank' => 0, 'classes' => '',
 			'custom_html' => '', 'captcha_size' => 'default',
-        );
+		);
 
 		if ( $limit ) {
-            return $field_options;
+			return $field_options;
 		}
 
-        global $wpdb;
+		global $wpdb;
 
-        $form_id = (is_numeric($field)) ? $field : $field->form_id;
+		$form_id = (is_numeric($field)) ? $field : $field->form_id;
 
-        $key = is_numeric($field) ? FrmAppHelper::get_unique_key('', $wpdb->prefix .'frm_fields', 'field_key') : $field->field_key;
+		$key = is_numeric($field) ? FrmAppHelper::get_unique_key('', $wpdb->prefix .'frm_fields', 'field_key') : $field->field_key;
 
-        $field_count = FrmDb::get_var( 'frm_fields', array( 'form_id' => $form_id ), 'field_order', array( 'order_by' => 'field_order DESC' ) );
+		$field_count = FrmDb::get_var( 'frm_fields', array( 'form_id' => $form_id ), 'field_order', array( 'order_by' => 'field_order DESC' ) );
 
-        $frm_settings = FrmAppHelper::get_settings();
-        return array(
-            'name' => __( 'Untitled', 'formidable' ), 'description' => '',
+		$frm_settings = FrmAppHelper::get_settings();
+		return array(
+			'name' => __( 'Untitled', 'formidable' ), 'description' => '',
 			'field_key' => $key, 'type' => $type, 'options' => '', 'default_value' => '',
 			'field_order' => $field_count + 1, 'required' => false,
-            'blank' => $frm_settings->blank_msg, 'unique_msg' => $frm_settings->unique_msg,
-            'invalid' => __( 'This field is invalid', 'formidable' ), 'form_id' => $form_id,
+			'blank' => $frm_settings->blank_msg, 'unique_msg' => $frm_settings->unique_msg,
+			'invalid' => __( 'This field is invalid', 'formidable' ), 'form_id' => $form_id,
 			'field_options' => $field_options,
-        );
-    }
+		);
+	}
 
-    public static function fill_field( &$values, $field, $form_id, $new_key = '' ) {
-        global $wpdb;
+	public static function fill_field( &$values, $field, $form_id, $new_key = '' ) {
+		global $wpdb;
 
-        $values['field_key'] = FrmAppHelper::get_unique_key($new_key, $wpdb->prefix .'frm_fields', 'field_key');
-        $values['form_id'] = $form_id;
-        $values['options'] = maybe_serialize($field->options);
-        $values['default_value'] = maybe_serialize($field->default_value);
+		$values['field_key'] = FrmAppHelper::get_unique_key($new_key, $wpdb->prefix .'frm_fields', 'field_key');
+		$values['form_id'] = $form_id;
+		$values['options'] = maybe_serialize($field->options);
+		$values['default_value'] = maybe_serialize($field->default_value);
 
-        foreach ( array( 'name', 'description', 'type', 'field_order', 'field_options', 'required' ) as $col ) {
-            $values[ $col ] = $field->{$col};
-        }
-    }
+		foreach ( array( 'name', 'description', 'type', 'field_order', 'field_options', 'required' ) as $col ) {
+			$values[ $col ] = $field->{$col};
+		}
+	}
 
-    /**
-     * @since 2.0
-     */
+	/**
+	 * @since 2.0
+	 */
 	public static function get_error_msg( $field, $error ) {
 		$frm_settings = FrmAppHelper::get_settings();
 		$default_settings = $frm_settings->default_options();
@@ -180,21 +180,21 @@ 
 		return $msg;
 	}
 
-    public static function get_form_fields( $form_id, $error = false ) {
-        $fields = FrmField::get_all_for_form($form_id);
-        $fields = apply_filters('frm_get_paged_fields', $fields, $form_id, $error);
-        return $fields;
-    }
+	public static function get_form_fields( $form_id, $error = false ) {
+		$fields = FrmField::get_all_for_form($form_id);
+		$fields = apply_filters('frm_get_paged_fields', $fields, $form_id, $error);
+		return $fields;
+	}
 
 	public static function get_default_html( $type = 'text' ) {
 		if ( apply_filters( 'frm_normal_field_type_html', true, $type ) ) {
 			$input = ( in_array( $type, array( 'radio', 'checkbox', 'data' ) ) ) ? '<div class="frm_opt_container">[input]</div>' : '[input]';
-            $for = '';
+			$for = '';
 			if ( ! in_array( $type, array( 'radio', 'checkbox', 'data', 'scale' ) ) ) {
-                $for = 'for="field_[key]"';
-            }
+				$for = 'for="field_[key]"';
+			}
 
-            $default_html = <<<DEFAULT_HTML
+			$default_html = <<<DEFAULT_HTML
 <div id="frm_field_[id]_container" class="frm_form_field form-field [required_class][error_class]">
     <label $for class="frm_primary_label">[field_name]
         <span class="frm_required">[required_label]</span>
@@ -204,145 +204,145 @@ 
     [if error]<div class="frm_error">[error]</div>[/if error]
 </div>
 DEFAULT_HTML;
-        } else {
+		} else {
 			$default_html = apply_filters('frm_other_custom_html', '', $type);
-        }
+		}
 
-        return apply_filters('frm_custom_html', $default_html, $type);
-    }
+		return apply_filters('frm_custom_html', $default_html, $type);
+	}
 
 	public static function replace_shortcodes( $html, $field, $errors = array(), $form = false, $args = array() ) {
-        $html = apply_filters('frm_before_replace_shortcodes', $html, $field, $errors, $form);
-
-        $defaults = array(
-            'field_name'  => 'item_meta['. $field['id'] .']',
-            'field_id'    => $field['id'],
-            'field_plus_id' => '',
-            'section_id'    => '',
-        );
-        $args = wp_parse_args($args, $defaults);
-        $field_name = $args['field_name'];
-        $field_id = $args['field_id'];
-        $html_id = self::get_html_id($field, $args['field_plus_id']);
-
-        if ( FrmField::is_multiple_select($field) ) {
-            $field_name .= '[]';
-        }
-
-        //replace [id]
-        $html = str_replace('[id]', $field_id, $html);
-
-        // Remove the for attribute for captcha
-        if ( $field['type'] == 'captcha' ) {
-            $html = str_replace(' for="field_[key]"', '', $html);
-        }
-
-        // set the label for
-        $html = str_replace('field_[key]', $html_id, $html);
-
-        //replace [key]
-        $html = str_replace('[key]', $field['field_key'], $html);
-
-        //replace [description] and [required_label] and [error]
+		$html = apply_filters('frm_before_replace_shortcodes', $html, $field, $errors, $form);
+
+		$defaults = array(
+			'field_name'  => 'item_meta['. $field['id'] .']',
+			'field_id'    => $field['id'],
+			'field_plus_id' => '',
+			'section_id'    => '',
+		);
+		$args = wp_parse_args($args, $defaults);
+		$field_name = $args['field_name'];
+		$field_id = $args['field_id'];
+		$html_id = self::get_html_id($field, $args['field_plus_id']);
+
+		if ( FrmField::is_multiple_select($field) ) {
+			$field_name .= '[]';
+		}
+
+		//replace [id]
+		$html = str_replace('[id]', $field_id, $html);
+
+		// Remove the for attribute for captcha
+		if ( $field['type'] == 'captcha' ) {
+			$html = str_replace(' for="field_[key]"', '', $html);
+		}
+
+		// set the label for
+		$html = str_replace('field_[key]', $html_id, $html);
+
+		//replace [key]
+		$html = str_replace('[key]', $field['field_key'], $html);
+
+		//replace [description] and [required_label] and [error]
 		$required = FrmField::is_required( $field ) ? $field['required_indicator'] : '';
-        if ( ! is_array( $errors ) ) {
-            $errors = array();
-        }
+		if ( ! is_array( $errors ) ) {
+			$errors = array();
+		}
 		$error = isset( $errors[ 'field' . $field_id ] ) ? $errors[ 'field' . $field_id ] : false;
 
-        //If field type is section heading, add class so a bottom margin can be added to either the h3 or description
-        if ( $field['type'] == 'divider' ) {
-            if ( FrmField::is_option_true( $field, 'description' ) ) {
-                $html = str_replace( 'frm_description', 'frm_description frm_section_spacing', $html );
-            } else {
-                $html = str_replace('[label_position]', '[label_position] frm_section_spacing', $html);
-            }
-        }
+		//If field type is section heading, add class so a bottom margin can be added to either the h3 or description
+		if ( $field['type'] == 'divider' ) {
+			if ( FrmField::is_option_true( $field, 'description' ) ) {
+				$html = str_replace( 'frm_description', 'frm_description frm_section_spacing', $html );
+			} else {
+				$html = str_replace('[label_position]', '[label_position] frm_section_spacing', $html);
+			}
+		}
 
 		foreach ( array( 'description' => $field['description'], 'required_label' => $required, 'error' => $error ) as $code => $value ) {
-            self::remove_inline_conditions( ( $value && $value != '' ), $code, $value, $html );
-        }
+			self::remove_inline_conditions( ( $value && $value != '' ), $code, $value, $html );
+		}
 
-        //replace [required_class]
+		//replace [required_class]
 		$required_class = FrmField::is_required( $field ) ? ' frm_required_field' : '';
-        $html = str_replace('[required_class]', $required_class, $html);
+		$html = str_replace('[required_class]', $required_class, $html);
 
-        //replace [label_position]
-        $field['label'] = apply_filters('frm_html_label_position', $field['label'], $field, $form);
-        $field['label'] = ( $field['label'] && $field['label'] != '' ) ? $field['label'] : 'top';
+		//replace [label_position]
+		$field['label'] = apply_filters('frm_html_label_position', $field['label'], $field, $form);
+		$field['label'] = ( $field['label'] && $field['label'] != '' ) ? $field['label'] : 'top';
 		$html = str_replace( '[label_position]', ( ( in_array( $field['type'], array( 'divider', 'end_divider', 'break' ) ) ) ? $field['label'] : ' frm_primary_label' ), $html );
 
-        //replace [field_name]
-        $html = str_replace('[field_name]', $field['name'], $html);
+		//replace [field_name]
+		$html = str_replace('[field_name]', $field['name'], $html);
 
-        //replace [error_class]
+		//replace [error_class]
 		$error_class = isset( $errors[ 'field' . $field_id ] ) ? ' frm_blank_field' : '';
 		self::get_more_field_classes( $error_class, $field, $field_id, $html );
 		if ( $field['type'] == 'html' && strpos( $html, '[error_class]' ) === false ) {
 			// there is no error_class shortcode to use for addign fields
 			$html = str_replace( 'class="frm_form_field', 'class="frm_form_field ' . $error_class, $html );
 		}
-        $html = str_replace('[error_class]', $error_class, $html);
+		$html = str_replace('[error_class]', $error_class, $html);
 
-        //replace [entry_key]
-        $entry_key = FrmAppHelper::simple_get( 'entry', 'sanitize_title' );
-        $html = str_replace('[entry_key]', $entry_key, $html);
+		//replace [entry_key]
+		$entry_key = FrmAppHelper::simple_get( 'entry', 'sanitize_title' );
+		$html = str_replace('[entry_key]', $entry_key, $html);
 
-        //replace [input]
-        preg_match_all("/\[(input|deletelink)\b(.*?)(?:(\/))?\]/s", $html, $shortcodes, PREG_PATTERN_ORDER);
-        global $frm_vars;
-        $frm_settings = FrmAppHelper::get_settings();
+		//replace [input]
+		preg_match_all("/\[(input|deletelink)\b(.*?)(?:(\/))?\]/s", $html, $shortcodes, PREG_PATTERN_ORDER);
+		global $frm_vars;
+		$frm_settings = FrmAppHelper::get_settings();
 
-        foreach ( $shortcodes[0] as $short_key => $tag ) {
-            $atts = shortcode_parse_atts( $shortcodes[2][ $short_key ] );
+		foreach ( $shortcodes[0] as $short_key => $tag ) {
+			$atts = shortcode_parse_atts( $shortcodes[2][ $short_key ] );
 			$tag = self::get_shortcode_tag( $shortcodes, $short_key, array( 'conditional' => false, 'conditional_check' => false ) );
 
-            $replace_with = '';
+			$replace_with = '';
 
-            if ( $tag == 'input' ) {
-                if ( isset($atts['opt']) ) {
-                    $atts['opt']--;
-                }
+			if ( $tag == 'input' ) {
+				if ( isset($atts['opt']) ) {
+					$atts['opt']--;
+				}
 
-                $field['input_class'] = isset($atts['class']) ? $atts['class'] : '';
-                if ( isset($atts['class']) ) {
-                    unset($atts['class']);
-                }
+				$field['input_class'] = isset($atts['class']) ? $atts['class'] : '';
+				if ( isset($atts['class']) ) {
+					unset($atts['class']);
+				}
 
-                $field['shortcodes'] = $atts;
-                ob_start();
-                include(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/input.php');
-                $replace_with = ob_get_contents();
-                ob_end_clean();
-            } else if ( $tag == 'deletelink' && FrmAppHelper::pro_is_installed() ) {
-                $replace_with = FrmProEntriesController::entry_delete_link($atts);
-            }
+				$field['shortcodes'] = $atts;
+				ob_start();
+				include(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/input.php');
+				$replace_with = ob_get_contents();
+				ob_end_clean();
+			} else if ( $tag == 'deletelink' && FrmAppHelper::pro_is_installed() ) {
+				$replace_with = FrmProEntriesController::entry_delete_link($atts);
+			}
 
-            $html = str_replace( $shortcodes[0][ $short_key ], $replace_with, $html );
-        }
+			$html = str_replace( $shortcodes[0][ $short_key ], $replace_with, $html );
+		}
 
 		if ( $form ) {
-            $form = (array) $form;
+			$form = (array) $form;
 
-            //replace [form_key]
-            $html = str_replace('[form_key]', $form['form_key'], $html);
+			//replace [form_key]
+			$html = str_replace('[form_key]', $form['form_key'], $html);
 
-            //replace [form_name]
-            $html = str_replace('[form_name]', $form['name'], $html);
-        }
-        $html .= "\n";
+			//replace [form_name]
+			$html = str_replace('[form_name]', $form['name'], $html);
+		}
+		$html .= "\n";
 
-        //Return html if conf_field to prevent loop
-        if ( isset($field['conf_field']) && $field['conf_field'] == 'stop' ) {
-            return $html;
-        }
+		//Return html if conf_field to prevent loop
+		if ( isset($field['conf_field']) && $field['conf_field'] == 'stop' ) {
+			return $html;
+		}
 
-        //If field is in repeating section
-        if ( $args['section_id'] ) {
-            $html = apply_filters('frm_replace_shortcodes', $html, $field, array( 'errors' => $errors, 'form' => $form, 'field_name' => $field_name, 'field_id' => $field_id, 'field_plus_id' => $args['field_plus_id'], 'section_id' => $args['section_id'] ));
-        } else {
-            $html = apply_filters('frm_replace_shortcodes', $html, $field, array( 'errors' => $errors, 'form' => $form ));
-        }
+		//If field is in repeating section
+		if ( $args['section_id'] ) {
+			$html = apply_filters('frm_replace_shortcodes', $html, $field, array( 'errors' => $errors, 'form' => $form, 'field_name' => $field_name, 'field_id' => $field_id, 'field_plus_id' => $args['field_plus_id'], 'section_id' => $args['section_id'] ));
+		} else {
+			$html = apply_filters('frm_replace_shortcodes', $html, $field, array( 'errors' => $errors, 'form' => $form ));
+		}
 
 		self::remove_collapse_shortcode( $html );
 
@@ -350,18 +350,18 @@ 
 			$html = do_shortcode( $html );
 		}
 
-        return $html;
-    }
+		return $html;
+	}
 
 	/**
-	* Add more classes to certain fields (like confirmation fields, other fields, repeating fields, etc.)
-	*
-	* @since 2.0
-	* @param $error_class string, pass by reference
-	* @param $field array
-	* @param $field_id int
-	* @param $html string
-	*/
+	 * Add more classes to certain fields (like confirmation fields, other fields, repeating fields, etc.)
+	 *
+	 * @since 2.0
+	 * @param $error_class string, pass by reference
+	 * @param $field array
+	 * @param $field_id int
+	 * @param $html string
+	 */
 	private static function get_more_field_classes( &$error_class, $field, $field_id, $html ) {
 		$error_class .= ' frm_'. $field['label'] .'_container';
 		if ( $field['id'] != $field_id ) {
@@ -425,46 +425,46 @@ 
 		}
 	}
 
-    public static function remove_inline_conditions( $no_vars, $code, $replace_with, &$html ) {
-        if ( $no_vars ) {
-            $html = str_replace( '[if '. $code.']', '', $html );
-    	    $html = str_replace( '[/if '. $code.']', '', $html );
-        } else {
-            $html = preg_replace( '/(\[if\s+'. $code .'\])(.*?)(\[\/if\s+'. $code .'\])/mis', '', $html );
-        }
+	public static function remove_inline_conditions( $no_vars, $code, $replace_with, &$html ) {
+		if ( $no_vars ) {
+			$html = str_replace( '[if '. $code.']', '', $html );
+			$html = str_replace( '[/if '. $code.']', '', $html );
+		} else {
+			$html = preg_replace( '/(\[if\s+'. $code .'\])(.*?)(\[\/if\s+'. $code .'\])/mis', '', $html );
+		}
 
-        $html = str_replace( '['. $code .']', $replace_with, $html );
-    }
+		$html = str_replace( '['. $code .']', $replace_with, $html );
+	}
 
 	public static function get_shortcode_tag( $shortcodes, $short_key, $args ) {
 		$args = wp_parse_args( $args, array( 'conditional' => false, 'conditional_check' => false, 'foreach' => false ) );
-        if ( ( $args['conditional'] || $args['foreach'] ) && ! $args['conditional_check'] ) {
-            $args['conditional_check'] = true;
-        }
-
-        $prefix = '';
-        if ( $args['conditional_check'] ) {
-            if ( $args['conditional'] ) {
-                $prefix = 'if ';
-            } else if ( $args['foreach'] ) {
-                $prefix = 'foreach ';
-            }
-        }
-
-        $with_tags = $args['conditional_check'] ? 3 : 2;
-        if ( ! empty( $shortcodes[ $with_tags ][ $short_key ] ) ) {
-            $tag = str_replace( '[' . $prefix, '', $shortcodes[0][ $short_key ] );
-            $tag = str_replace(']', '', $tag);
-            $tags = explode(' ', $tag);
-            if ( is_array($tags) ) {
-                $tag = $tags[0];
-            }
-        } else {
-            $tag = $shortcodes[ $with_tags - 1 ][ $short_key ];
-        }
-
-        return $tag;
-    }
+		if ( ( $args['conditional'] || $args['foreach'] ) && ! $args['conditional_check'] ) {
+			$args['conditional_check'] = true;
+		}
+
+		$prefix = '';
+		if ( $args['conditional_check'] ) {
+			if ( $args['conditional'] ) {
+				$prefix = 'if ';
+			} else if ( $args['foreach'] ) {
+				$prefix = 'foreach ';
+			}
+		}
+
+		$with_tags = $args['conditional_check'] ? 3 : 2;
+		if ( ! empty( $shortcodes[ $with_tags ][ $short_key ] ) ) {
+			$tag = str_replace( '[' . $prefix, '', $shortcodes[0][ $short_key ] );
+			$tag = str_replace(']', '', $tag);
+			$tags = explode(' ', $tag);
+			if ( is_array($tags) ) {
+				$tag = $tags[0];
+			}
+		} else {
+			$tag = $shortcodes[ $with_tags - 1 ][ $short_key ];
+		}
+
+		return $tag;
+	}
 
 	/**
 	 * Remove [collapse_this] if it's still included after all processing
@@ -477,128 +477,128 @@ 
 	}
 
 	public static function display_recaptcha( $field ) {
-        $frm_settings = FrmAppHelper::get_settings();
-        $lang = apply_filters('frm_recaptcha_lang', $frm_settings->re_lang, $field);
+		$frm_settings = FrmAppHelper::get_settings();
+		$lang = apply_filters('frm_recaptcha_lang', $frm_settings->re_lang, $field);
 
-        $api_js_url = 'https://www.google.com/recaptcha/api.js?onload=frmRecaptcha&render=explicit';
-        if ( $lang != 'en' ) {
-            $api_js_url .= '&hl='. $lang;
-        }
-        $api_js_url = apply_filters('frm_recpatcha_js_url', $api_js_url);
+		$api_js_url = 'https://www.google.com/recaptcha/api.js?onload=frmRecaptcha&render=explicit';
+		if ( $lang != 'en' ) {
+			$api_js_url .= '&hl='. $lang;
+		}
+		$api_js_url = apply_filters('frm_recpatcha_js_url', $api_js_url);
 
-        wp_register_script('recaptcha-api', $api_js_url, '', true);
-        wp_enqueue_script('recaptcha-api');
+		wp_register_script('recaptcha-api', $api_js_url, '', true);
+		wp_enqueue_script('recaptcha-api');
 
 ?>
 <div id="field_<?php echo esc_attr( $field['field_key'] ) ?>" class="frm-g-recaptcha" data-sitekey="<?php echo esc_attr( $frm_settings->pubkey ) ?>" data-size="<?php echo esc_attr( $field['captcha_size'] ) ?>"></div>
 <?php
-    }
+	}
 
 	public static function show_single_option( $field ) {
-        $field_name = $field['name'];
-        $html_id = self::get_html_id($field);
-        foreach ( $field['options'] as $opt_key => $opt ) {
-            $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-            $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
+		$field_name = $field['name'];
+		$html_id = self::get_html_id($field);
+		foreach ( $field['options'] as $opt_key => $opt ) {
+			$field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
+			$opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
 
-            // If this is an "Other" option, get the HTML for it
+			// If this is an "Other" option, get the HTML for it
 			if ( self::is_other_opt( $opt_key ) ) {
-                // Get string for Other text field, if needed
+				// Get string for Other text field, if needed
 				$other_val = self::get_other_val( compact( 'opt_key', 'field' ) );
-                require(FrmAppHelper::plugin_path() .'/pro/classes/views/frmpro-fields/other-option.php');
-            } else {
-                require(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/single-option.php');
-            }
-        }
-    }
+				require(FrmAppHelper::plugin_path() .'/pro/classes/views/frmpro-fields/other-option.php');
+			} else {
+				require(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/single-option.php');
+			}
+		}
+	}
 
 	public static function dropdown_categories( $args ) {
 		$defaults = array( 'field' => false, 'name' => false, 'show_option_all' => ' ' );
-        $args = wp_parse_args($args, $defaults);
+		$args = wp_parse_args($args, $defaults);
 
-        if ( ! $args['field'] ) {
-            return;
-        }
+		if ( ! $args['field'] ) {
+			return;
+		}
 
-        if ( ! $args['name'] ) {
-            $args['name'] = 'item_meta['. $args['field']['id'] .']';
-        }
+		if ( ! $args['name'] ) {
+			$args['name'] = 'item_meta['. $args['field']['id'] .']';
+		}
 
-        $id = self::get_html_id($args['field']);
-        $class = $args['field']['type'];
+		$id = self::get_html_id($args['field']);
+		$class = $args['field']['type'];
 
-        $exclude = (is_array($args['field']['exclude_cat'])) ? implode(',', $args['field']['exclude_cat']) : $args['field']['exclude_cat'];
-        $exclude = apply_filters('frm_exclude_cats', $exclude, $args['field']);
+		$exclude = (is_array($args['field']['exclude_cat'])) ? implode(',', $args['field']['exclude_cat']) : $args['field']['exclude_cat'];
+		$exclude = apply_filters('frm_exclude_cats', $exclude, $args['field']);
 
-        if ( is_array($args['field']['value']) ) {
-            if ( ! empty($exclude) ) {
-                $args['field']['value'] = array_diff($args['field']['value'], explode(',', $exclude));
-            }
-            $selected = reset($args['field']['value']);
-        } else {
-            $selected = $args['field']['value'];
-        }
+		if ( is_array($args['field']['value']) ) {
+			if ( ! empty($exclude) ) {
+				$args['field']['value'] = array_diff($args['field']['value'], explode(',', $exclude));
+			}
+			$selected = reset($args['field']['value']);
+		} else {
+			$selected = $args['field']['value'];
+		}
 
-        $tax_atts = array(
-            'show_option_all' => $args['show_option_all'], 'hierarchical' => 1, 'name' => $args['name'],
-            'id' => $id, 'exclude' => $exclude, 'class' => $class, 'selected' => $selected,
-            'hide_empty' => false, 'echo' => 0, 'orderby' => 'name',
-        );
+		$tax_atts = array(
+			'show_option_all' => $args['show_option_all'], 'hierarchical' => 1, 'name' => $args['name'],
+			'id' => $id, 'exclude' => $exclude, 'class' => $class, 'selected' => $selected,
+			'hide_empty' => false, 'echo' => 0, 'orderby' => 'name',
+		);
 
-        $tax_atts = apply_filters('frm_dropdown_cat', $tax_atts, $args['field']);
+		$tax_atts = apply_filters('frm_dropdown_cat', $tax_atts, $args['field']);
 
-        if ( FrmAppHelper::pro_is_installed() ) {
-            $post_type = FrmProFormsHelper::post_type($args['field']['form_id']);
-            $tax_atts['taxonomy'] = FrmProAppHelper::get_custom_taxonomy($post_type, $args['field']);
-            if ( ! $tax_atts['taxonomy'] ) {
-                return;
-            }
+		if ( FrmAppHelper::pro_is_installed() ) {
+			$post_type = FrmProFormsHelper::post_type($args['field']['form_id']);
+			$tax_atts['taxonomy'] = FrmProAppHelper::get_custom_taxonomy($post_type, $args['field']);
+			if ( ! $tax_atts['taxonomy'] ) {
+				return;
+			}
 
-            // If field type is dropdown (not Dynamic), exclude children when parent is excluded
-            if ( $args['field']['type'] != 'data' && is_taxonomy_hierarchical($tax_atts['taxonomy']) ) {
-                $tax_atts['exclude_tree'] = $exclude;
-            }
-        }
+			// If field type is dropdown (not Dynamic), exclude children when parent is excluded
+			if ( $args['field']['type'] != 'data' && is_taxonomy_hierarchical($tax_atts['taxonomy']) ) {
+				$tax_atts['exclude_tree'] = $exclude;
+			}
+		}
 
-        $dropdown = wp_dropdown_categories($tax_atts);
+		$dropdown = wp_dropdown_categories($tax_atts);
 
-        $add_html = FrmFieldsController::input_html($args['field'], false);
+		$add_html = FrmFieldsController::input_html($args['field'], false);
 
-        if ( FrmAppHelper::pro_is_installed() ) {
-            $add_html .= FrmProFieldsController::input_html($args['field'], false);
-        }
+		if ( FrmAppHelper::pro_is_installed() ) {
+			$add_html .= FrmProFieldsController::input_html($args['field'], false);
+		}
 
 		$dropdown = str_replace( "<select name='" . esc_attr( $args['name'] ) ."' id='" . esc_attr( $id ) . "' class='" . esc_attr( $class ) . "'", "<select name='" . esc_attr( $args['name'] ) . "' id='" . esc_attr( $id ) . "' " . $add_html, $dropdown );
 
-        if ( is_array($args['field']['value']) ) {
-            $skip = true;
-            foreach ( $args['field']['value'] as $v ) {
+		if ( is_array($args['field']['value']) ) {
+			$skip = true;
+			foreach ( $args['field']['value'] as $v ) {
 				if ( $skip ) {
-                    $skip = false;
-                    continue;
-                }
+					$skip = false;
+					continue;
+				}
 				$dropdown = str_replace(' value="' . esc_attr( $v ) . '"', ' value="' . esc_attr( $v ) . '" selected="selected"', $dropdown );
-                unset($v);
-            }
-        }
+				unset($v);
+			}
+		}
 
-        return $dropdown;
-    }
+		return $dropdown;
+	}
 
 	public static function get_term_link( $tax_id ) {
-        $tax = get_taxonomy($tax_id);
-        if ( ! $tax ) {
-            return;
-        }
+		$tax = get_taxonomy($tax_id);
+		if ( ! $tax ) {
+			return;
+		}
 
-        $link = sprintf(
-            __( 'Please add options from the WordPress "%1$s" page', 'formidable' ),
-            '<a href="'. esc_url( admin_url( 'edit-tags.php?taxonomy='. $tax->name ) ) .'" target="_blank">'. ( empty($tax->labels->name) ? __( 'Categories' ) : $tax->labels->name ) .'</a>'
-        );
-        unset($tax);
+		$link = sprintf(
+			__( 'Please add options from the WordPress "%1$s" page', 'formidable' ),
+			'<a href="'. esc_url( admin_url( 'edit-tags.php?taxonomy='. $tax->name ) ) .'" target="_blank">'. ( empty($tax->labels->name) ? __( 'Categories' ) : $tax->labels->name ) .'</a>'
+		);
+		unset($tax);
 
-        return $link;
-    }
+		return $link;
+	}
 
 	public static function value_meets_condition( $observed_value, $cond, $hide_opt ) {
 		// Remove white space from hide_opt
@@ -606,195 +606,195 @@ 
 			$hide_opt = rtrim( $hide_opt );
 		}
 
-        if ( is_array($observed_value) ) {
-            return self::array_value_condition($observed_value, $cond, $hide_opt);
-        }
-
-        $m = false;
-        if ( $cond == '==' ) {
-            $m = $observed_value == $hide_opt;
-        } else if ( $cond == '!=' ) {
-            $m = $observed_value != $hide_opt;
-        } else if ( $cond == '>' ) {
-            $m = $observed_value > $hide_opt;
-        } else if ( $cond == '<' ) {
-            $m = $observed_value < $hide_opt;
-        } else if ( $cond == 'LIKE' || $cond == 'not LIKE' ) {
-            $m = stripos($observed_value, $hide_opt);
-            if ( $cond == 'not LIKE' ) {
-                $m = ( $m === false ) ? true : false;
-            } else {
-                $m = ( $m === false ) ? false : true;
-            }
-        }
-        return $m;
-    }
+		if ( is_array($observed_value) ) {
+			return self::array_value_condition($observed_value, $cond, $hide_opt);
+		}
+
+		$m = false;
+		if ( $cond == '==' ) {
+			$m = $observed_value == $hide_opt;
+		} else if ( $cond == '!=' ) {
+			$m = $observed_value != $hide_opt;
+		} else if ( $cond == '>' ) {
+			$m = $observed_value > $hide_opt;
+		} else if ( $cond == '<' ) {
+			$m = $observed_value < $hide_opt;
+		} else if ( $cond == 'LIKE' || $cond == 'not LIKE' ) {
+			$m = stripos($observed_value, $hide_opt);
+			if ( $cond == 'not LIKE' ) {
+				$m = ( $m === false ) ? true : false;
+			} else {
+				$m = ( $m === false ) ? false : true;
+			}
+		}
+		return $m;
+	}
 
 	public static function array_value_condition( $observed_value, $cond, $hide_opt ) {
-        $m = false;
-        if ( $cond == '==' ) {
-            if ( is_array($hide_opt) ) {
-                $m = array_intersect($hide_opt, $observed_value);
-                $m = empty($m) ? false : true;
-            } else {
-                $m = in_array($hide_opt, $observed_value);
-            }
-        } else if ( $cond == '!=' ) {
-            $m = ! in_array($hide_opt, $observed_value);
-        } else if ( $cond == '>' ) {
-            $min = min($observed_value);
-            $m = $min > $hide_opt;
-        } else if ( $cond == '<' ) {
-            $max = max($observed_value);
-            $m = $max < $hide_opt;
-        } else if ( $cond == 'LIKE' || $cond == 'not LIKE' ) {
-            foreach ( $observed_value as $ob ) {
-                $m = strpos($ob, $hide_opt);
-                if ( $m !== false ) {
-                    $m = true;
-                    break;
-                }
-            }
-
-            if ( $cond == 'not LIKE' ) {
-                $m = ( $m === false ) ? true : false;
-            }
-        }
-
-        return $m;
-    }
-
-    /**
-     * Replace a few basic shortcodes and field ids
-     * @since 2.0
-     * @return string
-     */
+		$m = false;
+		if ( $cond == '==' ) {
+			if ( is_array($hide_opt) ) {
+				$m = array_intersect($hide_opt, $observed_value);
+				$m = empty($m) ? false : true;
+			} else {
+				$m = in_array($hide_opt, $observed_value);
+			}
+		} else if ( $cond == '!=' ) {
+			$m = ! in_array($hide_opt, $observed_value);
+		} else if ( $cond == '>' ) {
+			$min = min($observed_value);
+			$m = $min > $hide_opt;
+		} else if ( $cond == '<' ) {
+			$max = max($observed_value);
+			$m = $max < $hide_opt;
+		} else if ( $cond == 'LIKE' || $cond == 'not LIKE' ) {
+			foreach ( $observed_value as $ob ) {
+				$m = strpos($ob, $hide_opt);
+				if ( $m !== false ) {
+					$m = true;
+					break;
+				}
+			}
+
+			if ( $cond == 'not LIKE' ) {
+				$m = ( $m === false ) ? true : false;
+			}
+		}
+
+		return $m;
+	}
+
+	/**
+	 * Replace a few basic shortcodes and field ids
+	 * @since 2.0
+	 * @return string
+	 */
 	public static function basic_replace_shortcodes( $value, $form, $entry ) {
-        if ( strpos($value, '[sitename]') !== false ) {
-            $new_value = wp_specialchars_decode( FrmAppHelper::site_name(), ENT_QUOTES );
-            $value = str_replace('[sitename]', $new_value, $value);
-        }
+		if ( strpos($value, '[sitename]') !== false ) {
+			$new_value = wp_specialchars_decode( FrmAppHelper::site_name(), ENT_QUOTES );
+			$value = str_replace('[sitename]', $new_value, $value);
+		}
 
-        $value = apply_filters('frm_content', $value, $form, $entry);
-        $value = do_shortcode($value);
+		$value = apply_filters('frm_content', $value, $form, $entry);
+		$value = do_shortcode($value);
 
-        return $value;
-    }
+		return $value;
+	}
 
 	public static function get_shortcodes( $content, $form_id ) {
-        if ( FrmAppHelper::pro_is_installed() ) {
-            return FrmProDisplaysHelper::get_shortcodes($content, $form_id);
-        }
+		if ( FrmAppHelper::pro_is_installed() ) {
+			return FrmProDisplaysHelper::get_shortcodes($content, $form_id);
+		}
 
-        $fields = FrmField::getAll( array( 'fi.form_id' => (int) $form_id, 'fi.type not' => FrmField::no_save_fields() ) );
+		$fields = FrmField::getAll( array( 'fi.form_id' => (int) $form_id, 'fi.type not' => FrmField::no_save_fields() ) );
 
-        $tagregexp = self::allowed_shortcodes($fields);
+		$tagregexp = self::allowed_shortcodes($fields);
 
-        preg_match_all("/\[(if )?($tagregexp)\b(.*?)(?:(\/))?\](?:(.+?)\[\/\2\])?/s", $content, $matches, PREG_PATTERN_ORDER);
+		preg_match_all("/\[(if )?($tagregexp)\b(.*?)(?:(\/))?\](?:(.+?)\[\/\2\])?/s", $content, $matches, PREG_PATTERN_ORDER);
 
-        return $matches;
-    }
+		return $matches;
+	}
 
 	public static function allowed_shortcodes( $fields = array() ) {
-        $tagregexp = array(
-            'editlink', 'id', 'key', 'ip',
-            'siteurl', 'sitename', 'admin_email',
-            'post[-|_]id', 'created[-|_]at', 'updated[-|_]at', 'updated[-|_]by',
+		$tagregexp = array(
+			'editlink', 'id', 'key', 'ip',
+			'siteurl', 'sitename', 'admin_email',
+			'post[-|_]id', 'created[-|_]at', 'updated[-|_]at', 'updated[-|_]by',
 			'parent[-|_]id',
-        );
+		);
 
-        foreach ( $fields as $field ) {
-            $tagregexp[] = $field->id;
-            $tagregexp[] = $field->field_key;
-        }
+		foreach ( $fields as $field ) {
+			$tagregexp[] = $field->id;
+			$tagregexp[] = $field->field_key;
+		}
 
-        $tagregexp = implode('|', $tagregexp);
-        return $tagregexp;
-    }
+		$tagregexp = implode('|', $tagregexp);
+		return $tagregexp;
+	}
 
 	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
-        $shortcode_values = array(
-           'id'     => $entry->id,
-           'key'    => $entry->item_key,
-           'ip'     => $entry->ip,
-        );
+		$shortcode_values = array(
+		   'id'     => $entry->id,
+		   'key'    => $entry->item_key,
+		   'ip'     => $entry->ip,
+		);
 
-        foreach ( $shortcodes[0] as $short_key => $tag ) {
-            $atts = shortcode_parse_atts( $shortcodes[3][ $short_key ] );
+		foreach ( $shortcodes[0] as $short_key => $tag ) {
+			$atts = shortcode_parse_atts( $shortcodes[3][ $short_key ] );
 
-            if ( ! empty( $shortcodes[3][ $short_key ] ) ) {
+			if ( ! empty( $shortcodes[3][ $short_key ] ) ) {
 				$tag = str_replace( array( '[', ']' ), '', $shortcodes[0][ $short_key ] );
-                $tags = explode(' ', $tag);
-                if ( is_array($tags) ) {
-                    $tag = $tags[0];
-                }
-            } else {
-                $tag = $shortcodes[2][ $short_key ];
-            }
-
-            switch ( $tag ) {
-                case 'id':
-                case 'key':
-                case 'ip':
-                    $replace_with = $shortcode_values[ $tag ];
-                break;
-
-                case 'user_agent':
-                case 'user-agent':
-                    $entry->description = maybe_unserialize($entry->description);
+				$tags = explode(' ', $tag);
+				if ( is_array($tags) ) {
+					$tag = $tags[0];
+				}
+			} else {
+				$tag = $shortcodes[2][ $short_key ];
+			}
+
+			switch ( $tag ) {
+				case 'id':
+				case 'key':
+				case 'ip':
+					$replace_with = $shortcode_values[ $tag ];
+				break;
+
+				case 'user_agent':
+				case 'user-agent':
+					$entry->description = maybe_unserialize($entry->description);
 					$replace_with = FrmEntryFormat::get_browser( $entry->description['browser'] );
-                break;
-
-                case 'created_at':
-                case 'created-at':
-                case 'updated_at':
-                case 'updated-at':
-                    if ( isset($atts['format']) ) {
-                        $time_format = ' ';
-                    } else {
-                        $atts['format'] = get_option('date_format');
-                        $time_format = '';
-                    }
-
-                    $this_tag = str_replace('-', '_', $tag);
-                    $replace_with = FrmAppHelper::get_formatted_time($entry->{$this_tag}, $atts['format'], $time_format);
-                    unset($this_tag);
-                break;
-
-                case 'created_by':
-                case 'created-by':
-                case 'updated_by':
-                case 'updated-by':
-                    $this_tag = str_replace('-', '_', $tag);
+				break;
+
+				case 'created_at':
+				case 'created-at':
+				case 'updated_at':
+				case 'updated-at':
+					if ( isset($atts['format']) ) {
+						$time_format = ' ';
+					} else {
+						$atts['format'] = get_option('date_format');
+						$time_format = '';
+					}
+
+					$this_tag = str_replace('-', '_', $tag);
+					$replace_with = FrmAppHelper::get_formatted_time($entry->{$this_tag}, $atts['format'], $time_format);
+					unset($this_tag);
+				break;
+
+				case 'created_by':
+				case 'created-by':
+				case 'updated_by':
+				case 'updated-by':
+					$this_tag = str_replace('-', '_', $tag);
 					$replace_with = self::get_display_value( $entry->{$this_tag}, (object) array( 'type' => 'user_id' ), $atts );
-                    unset($this_tag);
-                break;
-
-                case 'admin_email':
-                case 'siteurl':
-                case 'frmurl':
-                case 'sitename':
-                case 'get':
-                    $replace_with = self::dynamic_default_values( $tag, $atts );
-                break;
-
-                default:
-                    $field = FrmField::getOne( $tag );
-                    if ( ! $field ) {
-                        break;
-                    }
-
-                    $sep = isset($atts['sep']) ? $atts['sep'] : ', ';
-
-                    $replace_with = FrmEntryMeta::get_meta_value( $entry, $field->id );
-
-                    $atts['entry_id'] = $entry->id;
-                    $atts['entry_key'] = $entry->item_key;
-
-                    if ( isset($atts['show']) && $atts['show'] == 'field_label' ) {
-                        $replace_with = $field->name;
-                    } else if ( isset($atts['show']) && $atts['show'] == 'description' ) {
-                        $replace_with = $field->description;
+					unset($this_tag);
+				break;
+
+				case 'admin_email':
+				case 'siteurl':
+				case 'frmurl':
+				case 'sitename':
+				case 'get':
+					$replace_with = self::dynamic_default_values( $tag, $atts );
+				break;
+
+				default:
+					$field = FrmField::getOne( $tag );
+					if ( ! $field ) {
+						break;
+					}
+
+					$sep = isset($atts['sep']) ? $atts['sep'] : ', ';
+
+					$replace_with = FrmEntryMeta::get_meta_value( $entry, $field->id );
+
+					$atts['entry_id'] = $entry->id;
+					$atts['entry_key'] = $entry->item_key;
+
+					if ( isset($atts['show']) && $atts['show'] == 'field_label' ) {
+						$replace_with = $field->name;
+					} else if ( isset($atts['show']) && $atts['show'] == 'description' ) {
+						$replace_with = $field->description;
 					} else {
 						$string_value = $replace_with;
 						if ( is_array( $replace_with ) ) {
@@ -808,82 +808,82 @@ 
 						}
 					}
 
-                    unset($field);
-                break;
-            }
+					unset($field);
+				break;
+			}
 
-            if ( isset($replace_with) ) {
-                $content = str_replace( $shortcodes[0][ $short_key ], $replace_with, $content );
-            }
+			if ( isset($replace_with) ) {
+				$content = str_replace( $shortcodes[0][ $short_key ], $replace_with, $content );
+			}
 
-            unset($atts, $conditional, $replace_with);
+			unset($atts, $conditional, $replace_with);
 		}
 
 		return $content;
-    }
-
-    /**
-     * Get the value to replace a few standard shortcodes
-     *
-     * @since 2.0
-     * @return string
-     */
-    public static function dynamic_default_values( $tag, $atts = array(), $return_array = false ) {
-        $new_value = '';
-        switch ( $tag ) {
-            case 'admin_email':
-                $new_value = get_option('admin_email');
-                break;
-            case 'siteurl':
-                $new_value = FrmAppHelper::site_url();
-                break;
-            case 'frmurl':
-                $new_value = FrmAppHelper::plugin_url();
-                break;
-            case 'sitename':
-                $new_value = FrmAppHelper::site_name();
-                break;
-            case 'get':
-                $new_value = self::process_get_shortcode( $atts, $return_array );
-                break;
-        }
-
-        return $new_value;
-    }
-
-    /**
-     * Process the [get] shortcode
-     *
-     * @since 2.0
-     * @return string|array
-     */
-    public static function process_get_shortcode( $atts, $return_array = false ) {
-        if ( ! isset($atts['param']) ) {
-            return '';
-        }
-
-        if ( strpos($atts['param'], '&#91;') ) {
-            $atts['param'] = str_replace('&#91;', '[', $atts['param']);
-            $atts['param'] = str_replace('&#93;', ']', $atts['param']);
-        }
-
-        $new_value = FrmAppHelper::get_param($atts['param'], '');
-        $new_value = FrmAppHelper::get_query_var( $new_value, $atts['param'] );
-
-        if ( $new_value == '' ) {
-            if ( ! isset($atts['prev_val']) ) {
-                $atts['prev_val'] = '';
-            }
-
-            $new_value = isset($atts['default']) ? $atts['default'] : $atts['prev_val'];
-        }
-
-        if ( is_array($new_value) && ! $return_array ) {
-            $new_value = implode(', ', $new_value);
-        }
-
-        return $new_value;
-    }
+	}
+
+	/**
+	 * Get the value to replace a few standard shortcodes
+	 *
+	 * @since 2.0
+	 * @return string
+	 */
+	public static function dynamic_default_values( $tag, $atts = array(), $return_array = false ) {
+		$new_value = '';
+		switch ( $tag ) {
+			case 'admin_email':
+				$new_value = get_option('admin_email');
+				break;
+			case 'siteurl':
+				$new_value = FrmAppHelper::site_url();
+				break;
+			case 'frmurl':
+				$new_value = FrmAppHelper::plugin_url();
+				break;
+			case 'sitename':
+				$new_value = FrmAppHelper::site_name();
+				break;
+			case 'get':
+				$new_value = self::process_get_shortcode( $atts, $return_array );
+				break;
+		}
+
+		return $new_value;
+	}
+
+	/**
+	 * Process the [get] shortcode
+	 *
+	 * @since 2.0
+	 * @return string|array
+	 */
+	public static function process_get_shortcode( $atts, $return_array = false ) {
+		if ( ! isset($atts['param']) ) {
+			return '';
+		}
+
+		if ( strpos($atts['param'], '&#91;') ) {
+			$atts['param'] = str_replace('&#91;', '[', $atts['param']);
+			$atts['param'] = str_replace('&#93;', ']', $atts['param']);
+		}
+
+		$new_value = FrmAppHelper::get_param($atts['param'], '');
+		$new_value = FrmAppHelper::get_query_var( $new_value, $atts['param'] );
+
+		if ( $new_value == '' ) {
+			if ( ! isset($atts['prev_val']) ) {
+				$atts['prev_val'] = '';
+			}
+
+			$new_value = isset($atts['default']) ? $atts['default'] : $atts['prev_val'];
+		}
+
+		if ( is_array($new_value) && ! $return_array ) {
+			$new_value = implode(', ', $new_value);
+		}
+
+		return $new_value;
+	}
 
 	public static function get_display_value( $replace_with, $field, $atts = array() ) {
 		$atts['sep'] = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
@@ -891,14 +891,14 @@ 
 		$replace_with = apply_filters( 'frm_get_' . $field->type . '_display_value', $replace_with, $field, $atts );
 		$replace_with = apply_filters( 'frm_get_display_value', $replace_with, $field, $atts );
 
-        if ( $field->type == 'textarea' || $field->type == 'rte' ) {
-            $autop = isset($atts['wpautop']) ? $atts['wpautop'] : true;
-            if ( apply_filters('frm_use_wpautop', $autop) ) {
-                if ( is_array($replace_with) ) {
-                    $replace_with = implode("\n", $replace_with);
-                }
-                $replace_with = wpautop($replace_with);
-            }
+		if ( $field->type == 'textarea' || $field->type == 'rte' ) {
+			$autop = isset($atts['wpautop']) ? $atts['wpautop'] : true;
+			if ( apply_filters('frm_use_wpautop', $autop) ) {
+				if ( is_array($replace_with) ) {
+					$replace_with = implode("\n", $replace_with);
+				}
+				$replace_with = wpautop($replace_with);
+			}
 			unset( $autop );
 		} else if ( is_array( $replace_with ) ) {
 			$replace_with = implode( $atts['sep'], $replace_with );
@@ -908,57 +908,57 @@ 
 	}
 
 	public static function get_field_types( $type ) {
-        $single_input = array(
-            'text', 'textarea', 'rte', 'number', 'email', 'url',
-            'image', 'file', 'date', 'phone', 'hidden', 'time',
-            'user_id', 'tag', 'password',
-        );
+		$single_input = array(
+			'text', 'textarea', 'rte', 'number', 'email', 'url',
+			'image', 'file', 'date', 'phone', 'hidden', 'time',
+			'user_id', 'tag', 'password',
+		);
 		$multiple_input = array( 'radio', 'checkbox', 'select', 'scale' );
 		$other_type = array( 'divider', 'html', 'break' );
 
 		$field_selection = array_merge( FrmField::pro_field_selection(), FrmField::field_selection() );
 
-        $field_types = array();
-        if ( in_array($type, $single_input) ) {
-            self::field_types_for_input( $single_input, $field_selection, $field_types );
-        } else if ( in_array($type, $multiple_input) ) {
-            self::field_types_for_input( $multiple_input, $field_selection, $field_types );
-        } else if ( in_array($type, $other_type) ) {
-            self::field_types_for_input( $other_type, $field_selection, $field_types );
+		$field_types = array();
+		if ( in_array($type, $single_input) ) {
+			self::field_types_for_input( $single_input, $field_selection, $field_types );
+		} else if ( in_array($type, $multiple_input) ) {
+			self::field_types_for_input( $multiple_input, $field_selection, $field_types );
+		} else if ( in_array($type, $other_type) ) {
+			self::field_types_for_input( $other_type, $field_selection, $field_types );
 		} else if ( isset( $field_selection[ $type ] ) ) {
-            $field_types[ $type ] = $field_selection[ $type ];
-        }
-
-        return $field_types;
-    }
-
-    private static function field_types_for_input( $inputs, $fields, &$field_types ) {
-        foreach ( $inputs as $input ) {
-            $field_types[ $input ] = $fields[ $input ];
-            unset($input);
-        }
-    }
-
-    /**
-    * Check if current field option is an "other" option
-    *
-    * @since 2.0.6
-    *
-    * @param string $opt_key
-    * @return boolean Returns true if current field option is an "Other" option
-    */
-    public static function is_other_opt( $opt_key ) {
-        return $opt_key && strpos( $opt_key, 'other' ) !== false;
-    }
-
-    /**
-    * Get value that belongs in "Other" text box
-    *
-    * @since 2.0.6
-    *
-    * @param array $args
-    */
-    public static function get_other_val( $args ) {
+			$field_types[ $type ] = $field_selection[ $type ];
+		}
+
+		return $field_types;
+	}
+
+	private static function field_types_for_input( $inputs, $fields, &$field_types ) {
+		foreach ( $inputs as $input ) {
+			$field_types[ $input ] = $fields[ $input ];
+			unset($input);
+		}
+	}
+
+	/**
+	 * Check if current field option is an "other" option
+	 *
+	 * @since 2.0.6
+	 *
+	 * @param string $opt_key
+	 * @return boolean Returns true if current field option is an "Other" option
+	 */
+	public static function is_other_opt( $opt_key ) {
+		return $opt_key && strpos( $opt_key, 'other' ) !== false;
+	}
+
+	/**
+	 * Get value that belongs in "Other" text box
+	 *
+	 * @since 2.0.6
+	 *
+	 * @param array $args
+	 */
+	public static function get_other_val( $args ) {
 		$defaults = array(
 			'opt_key' => 0, 'field' => array(),
 			'parent' => false, 'pointer' => false,
@@ -1034,20 +1034,20 @@ 
 		}
 
 		return $other_val;
-    }
-
-    /**
-    * Check if there is a saved value for the "Other" text field. If so, set it as the $other_val.
-    * Intended for front-end use
-    *
-    * @since 2.0.6
-    *
-    * @param array $args should include field, opt_key and field name
-    * @param boolean $other_opt
-    * @param string $checked
-    * @return string $other_val
-    */
-    public static function prepare_other_input( $args, &$other_opt, &$checked ) {
+	}
+
+	/**
+	 * Check if there is a saved value for the "Other" text field. If so, set it as the $other_val.
+	 * Intended for front-end use
+	 *
+	 * @since 2.0.6
+	 *
+	 * @param array $args should include field, opt_key and field name
+	 * @param boolean $other_opt
+	 * @param string $checked
+	 * @return string $other_val
+	 */
+	public static function prepare_other_input( $args, &$other_opt, &$checked ) {
 		//Check if this is an "Other" option
 		if ( ! self::is_other_opt( $args['opt_key'] ) ) {
 			return;
@@ -1063,8 +1063,8 @@ 
 			$checked = 'checked="checked" ';
 		}
 
-        return $other_args;
-    }
+		return $other_args;
+	}
 
 	/**
 	 * @param array $args
@@ -1113,8 +1113,8 @@ 
 	 * @since 2.0.6
 	 */
 	public static function include_other_input( $args ) {
-        if ( ! $args['other_opt'] ) {
-        	return;
+		if ( ! $args['other_opt'] ) {
+			return;
 		}
 
 		$classes = array( 'frm_other_input' );
@@ -1135,15 +1135,15 @@ 
 	}
 
 	/**
-	* Get the HTML id for an "Other" text field
-	* Note: This does not affect fields in repeating sections
-	*
-	* @since 2.0.08
-	* @param string $type - field type
-	* @param string $html_id
-	* @param string|boolean $opt_key
-	* @return string $other_id
-	*/
+	 * Get the HTML id for an "Other" text field
+	 * Note: This does not affect fields in repeating sections
+	 *
+	 * @since 2.0.08
+	 * @param string $type - field type
+	 * @param string $html_id
+	 * @param string|boolean $opt_key
+	 * @return string $other_id
+	 */
 	public static function get_other_field_html_id( $type, $html_id, $opt_key = false ) {
 		$other_id = $html_id;
 
@@ -1201,171 +1201,171 @@ 
 	}
 
 	public static function switch_field_ids( $val ) {
-        global $frm_duplicate_ids;
-        $replace = array();
-        $replace_with = array();
-        foreach ( (array) $frm_duplicate_ids as $old => $new ) {
-            $replace[] = '[if '. $old .']';
-            $replace_with[] = '[if '. $new .']';
-            $replace[] = '[if '. $old .' ';
-            $replace_with[] = '[if '. $new .' ';
-            $replace[] = '[/if '. $old .']';
-            $replace_with[] = '[/if '. $new .']';
-            $replace[] = '[foreach '. $old .']';
-            $replace_with[] = '[foreach '. $new .']';
-            $replace[] = '[/foreach '. $old .']';
-            $replace_with[] = '[/foreach '. $new .']';
-            $replace[] = '['. $old .']';
-            $replace_with[] = '['. $new .']';
-            $replace[] = '['. $old .' ';
-            $replace_with[] = '['. $new .' ';
-            unset($old, $new);
-        }
+		global $frm_duplicate_ids;
+		$replace = array();
+		$replace_with = array();
+		foreach ( (array) $frm_duplicate_ids as $old => $new ) {
+			$replace[] = '[if '. $old .']';
+			$replace_with[] = '[if '. $new .']';
+			$replace[] = '[if '. $old .' ';
+			$replace_with[] = '[if '. $new .' ';
+			$replace[] = '[/if '. $old .']';
+			$replace_with[] = '[/if '. $new .']';
+			$replace[] = '[foreach '. $old .']';
+			$replace_with[] = '[foreach '. $new .']';
+			$replace[] = '[/foreach '. $old .']';
+			$replace_with[] = '[/foreach '. $new .']';
+			$replace[] = '['. $old .']';
+			$replace_with[] = '['. $new .']';
+			$replace[] = '['. $old .' ';
+			$replace_with[] = '['. $new .' ';
+			unset($old, $new);
+		}
 		if ( is_array( $val ) ) {
 			foreach ( $val as $k => $v ) {
-                $val[ $k ] = str_replace( $replace, $replace_with, $v );
-                unset($k, $v);
-            }
-        } else {
-            $val = str_replace($replace, $replace_with, $val);
-        }
-
-        return $val;
-    }
-
-    public static function get_us_states() {
-        return apply_filters( 'frm_us_states', array(
-            'AL' => 'Alabama', 'AK' => 'Alaska', 'AR' => 'Arkansas', 'AZ' => 'Arizona',
-            'CA' => 'California', 'CO' => 'Colorado', 'CT' => 'Connecticut', 'DE' => 'Delaware',
-            'DC' => 'District of Columbia',
-            'FL' => 'Florida', 'GA' => 'Georgia', 'HI' => 'Hawaii', 'ID' => 'Idaho',
-            'IL' => 'Illinois', 'IN' => 'Indiana', 'IA' => 'Iowa', 'KS' => 'Kansas',
-            'KY' => 'Kentucky', 'LA' => 'Louisiana', 'ME' => 'Maine','MD' => 'Maryland',
-            'MA' => 'Massachusetts', 'MI' => 'Michigan', 'MN' => 'Minnesota', 'MS' => 'Mississippi',
-            'MO' => 'Missouri', 'MT' => 'Montana', 'NE' => 'Nebraska', 'NV' => 'Nevada',
-            'NH' => 'New Hampshire', 'NJ' => 'New Jersey', 'NM' => 'New Mexico', 'NY' => 'New York',
-            'NC' => 'North Carolina', 'ND' => 'North Dakota', 'OH' => 'Ohio', 'OK' => 'Oklahoma',
-            'OR' => 'Oregon', 'PA' => 'Pennsylvania', 'RI' => 'Rhode Island', 'SC' => 'South Carolina',
-            'SD' => 'South Dakota', 'TN' => 'Tennessee', 'TX' => 'Texas', 'UT' => 'Utah',
-            'VT' => 'Vermont', 'VA' => 'Virginia', 'WA' => 'Washington', 'WV' => 'West Virginia',
-            'WI' => 'Wisconsin', 'WY' => 'Wyoming',
-        ) );
-    }
-
-    public static function get_countries() {
-        return apply_filters( 'frm_countries', array(
-            __( 'Afghanistan', 'formidable' ), __( 'Albania', 'formidable' ), __( 'Algeria', 'formidable' ),
-            __( 'American Samoa', 'formidable' ), __( 'Andorra', 'formidable' ), __( 'Angola', 'formidable' ),
-            __( 'Anguilla', 'formidable' ), __( 'Antarctica', 'formidable' ), __( 'Antigua and Barbuda', 'formidable' ),
-            __( 'Argentina', 'formidable' ), __( 'Armenia', 'formidable' ), __( 'Aruba', 'formidable' ),
-            __( 'Australia', 'formidable' ), __( 'Austria', 'formidable' ), __( 'Azerbaijan', 'formidable' ),
-            __( 'Bahamas', 'formidable' ), __( 'Bahrain', 'formidable' ), __( 'Bangladesh', 'formidable' ),
-            __( 'Barbados', 'formidable' ), __( 'Belarus', 'formidable' ), __( 'Belgium', 'formidable' ),
-            __( 'Belize', 'formidable' ), __( 'Benin', 'formidable' ), __( 'Bermuda', 'formidable' ),
-            __( 'Bhutan', 'formidable' ), __( 'Bolivia', 'formidable' ), __( 'Bosnia and Herzegovina', 'formidable' ),
-            __( 'Botswana', 'formidable' ), __( 'Brazil', 'formidable' ), __( 'Brunei', 'formidable' ),
-            __( 'Bulgaria', 'formidable' ), __( 'Burkina Faso', 'formidable' ), __( 'Burundi', 'formidable' ),
-            __( 'Cambodia', 'formidable' ), __( 'Cameroon', 'formidable' ), __( 'Canada', 'formidable' ),
-            __( 'Cape Verde', 'formidable' ), __( 'Cayman Islands', 'formidable' ), __( 'Central African Republic', 'formidable' ),
-            __( 'Chad', 'formidable' ), __( 'Chile', 'formidable' ), __( 'China', 'formidable' ),
-            __( 'Colombia', 'formidable' ), __( 'Comoros', 'formidable' ), __( 'Congo', 'formidable' ),
-            __( 'Costa Rica', 'formidable' ), __( 'C&ocirc;te d\'Ivoire', 'formidable' ), __( 'Croatia', 'formidable' ),
-            __( 'Cuba', 'formidable' ), __( 'Cyprus', 'formidable' ), __( 'Czech Republic', 'formidable' ),
-            __( 'Denmark', 'formidable' ), __( 'Djibouti', 'formidable' ), __( 'Dominica', 'formidable' ),
-            __( 'Dominican Republic', 'formidable' ), __( 'East Timor', 'formidable' ), __( 'Ecuador', 'formidable' ),
-            __( 'Egypt', 'formidable' ), __( 'El Salvador', 'formidable' ), __( 'Equatorial Guinea', 'formidable' ),
-            __( 'Eritrea', 'formidable' ), __( 'Estonia', 'formidable' ), __( 'Ethiopia', 'formidable' ),
-            __( 'Fiji', 'formidable' ), __( 'Finland', 'formidable' ), __( 'France', 'formidable' ),
-            __( 'French Guiana', 'formidable' ), __( 'French Polynesia', 'formidable' ), __( 'Gabon', 'formidable' ),
-            __( 'Gambia', 'formidable' ), __( 'Georgia', 'formidable' ), __( 'Germany', 'formidable' ),
-            __( 'Ghana', 'formidable' ), __( 'Gibraltar', 'formidable' ), __( 'Greece', 'formidable' ),
-            __( 'Greenland', 'formidable' ), __( 'Grenada', 'formidable' ), __( 'Guam', 'formidable' ),
-            __( 'Guatemala', 'formidable' ), __( 'Guinea', 'formidable' ), __( 'Guinea-Bissau', 'formidable' ),
-            __( 'Guyana', 'formidable' ), __( 'Haiti', 'formidable' ), __( 'Honduras', 'formidable' ),
-            __( 'Hong Kong', 'formidable' ), __( 'Hungary', 'formidable' ), __( 'Iceland', 'formidable' ),
-            __( 'India', 'formidable' ), __( 'Indonesia', 'formidable' ), __( 'Iran', 'formidable' ),
-            __( 'Iraq', 'formidable' ), __( 'Ireland', 'formidable' ), __( 'Israel', 'formidable' ),
-            __( 'Italy', 'formidable' ), __( 'Jamaica', 'formidable' ), __( 'Japan', 'formidable' ),
-            __( 'Jordan', 'formidable' ), __( 'Kazakhstan', 'formidable' ), __( 'Kenya', 'formidable' ),
-            __( 'Kiribati', 'formidable' ), __( 'North Korea', 'formidable' ), __( 'South Korea', 'formidable' ),
-            __( 'Kuwait', 'formidable' ), __( 'Kyrgyzstan', 'formidable' ), __( 'Laos', 'formidable' ),
-            __( 'Latvia', 'formidable' ), __( 'Lebanon', 'formidable' ), __( 'Lesotho', 'formidable' ),
-            __( 'Liberia', 'formidable' ), __( 'Libya', 'formidable' ), __( 'Liechtenstein', 'formidable' ),
-            __( 'Lithuania', 'formidable' ), __( 'Luxembourg', 'formidable' ), __( 'Macedonia', 'formidable' ),
-            __( 'Madagascar', 'formidable' ), __( 'Malawi', 'formidable' ), __( 'Malaysia', 'formidable' ),
-            __( 'Maldives', 'formidable' ), __( 'Mali', 'formidable' ), __( 'Malta', 'formidable' ),
-            __( 'Marshall Islands', 'formidable' ), __( 'Mauritania', 'formidable' ), __( 'Mauritius', 'formidable' ),
-            __( 'Mexico', 'formidable' ), __( 'Micronesia', 'formidable' ), __( 'Moldova', 'formidable' ),
-            __( 'Monaco', 'formidable' ), __( 'Mongolia', 'formidable' ), __( 'Montenegro', 'formidable' ),
-            __( 'Montserrat', 'formidable' ), __( 'Morocco', 'formidable' ), __( 'Mozambique', 'formidable' ),
-            __( 'Myanmar', 'formidable' ), __( 'Namibia', 'formidable' ), __( 'Nauru', 'formidable' ),
-            __( 'Nepal', 'formidable' ), __( 'Netherlands', 'formidable' ), __( 'New Zealand', 'formidable' ),
-            __( 'Nicaragua', 'formidable' ), __( 'Niger', 'formidable' ), __( 'Nigeria', 'formidable' ),
-            __( 'Norway', 'formidable' ), __( 'Northern Mariana Islands', 'formidable' ), __( 'Oman', 'formidable' ),
-            __( 'Pakistan', 'formidable' ), __( 'Palau', 'formidable' ), __( 'Palestine', 'formidable' ),
-            __( 'Panama', 'formidable' ), __( 'Papua New Guinea', 'formidable' ), __( 'Paraguay', 'formidable' ),
-            __( 'Peru', 'formidable' ), __( 'Philippines', 'formidable' ), __( 'Poland', 'formidable' ),
-            __( 'Portugal', 'formidable' ), __( 'Puerto Rico', 'formidable' ), __( 'Qatar', 'formidable' ),
-            __( 'Romania', 'formidable' ), __( 'Russia', 'formidable' ), __( 'Rwanda', 'formidable' ),
-            __( 'Saint Kitts and Nevis', 'formidable' ), __( 'Saint Lucia', 'formidable' ),
-            __( 'Saint Vincent and the Grenadines', 'formidable' ), __( 'Samoa', 'formidable' ),
-            __( 'San Marino', 'formidable' ), __( 'Sao Tome and Principe', 'formidable' ), __( 'Saudi Arabia', 'formidable' ),
-            __( 'Senegal', 'formidable' ), __( 'Serbia and Montenegro', 'formidable' ), __( 'Seychelles', 'formidable' ),
-            __( 'Sierra Leone', 'formidable' ), __( 'Singapore', 'formidable' ), __( 'Slovakia', 'formidable' ),
-            __( 'Slovenia', 'formidable' ), __( 'Solomon Islands', 'formidable' ), __( 'Somalia', 'formidable' ),
-            __( 'South Africa', 'formidable' ), __( 'South Sudan', 'formidable' ),
-            __( 'Spain', 'formidable' ), __( 'Sri Lanka', 'formidable' ),
-            __( 'Sudan', 'formidable' ), __( 'Suriname', 'formidable' ), __( 'Swaziland', 'formidable' ),
-            __( 'Sweden', 'formidable' ), __( 'Switzerland', 'formidable' ), __( 'Syria', 'formidable' ),
-            __( 'Taiwan', 'formidable' ), __( 'Tajikistan', 'formidable' ), __( 'Tanzania', 'formidable' ),
-            __( 'Thailand', 'formidable' ), __( 'Togo', 'formidable' ), __( 'Tonga', 'formidable' ),
-            __( 'Trinidad and Tobago', 'formidable' ), __( 'Tunisia', 'formidable' ), __( 'Turkey', 'formidable' ),
-            __( 'Turkmenistan', 'formidable' ), __( 'Tuvalu', 'formidable' ), __( 'Uganda', 'formidable' ),
-            __( 'Ukraine', 'formidable' ), __( 'United Arab Emirates', 'formidable' ), __( 'United Kingdom', 'formidable' ),
-            __( 'United States', 'formidable' ), __( 'Uruguay', 'formidable' ), __( 'Uzbekistan', 'formidable' ),
-            __( 'Vanuatu', 'formidable' ), __( 'Vatican City', 'formidable' ), __( 'Venezuela', 'formidable' ),
-            __( 'Vietnam', 'formidable' ), __( 'Virgin Islands, British', 'formidable' ),
-            __( 'Virgin Islands, U.S.', 'formidable' ), __( 'Yemen', 'formidable' ), __( 'Zambia', 'formidable' ),
-            __( 'Zimbabwe', 'formidable' ),
-        ) );
-    }
+				$val[ $k ] = str_replace( $replace, $replace_with, $v );
+				unset($k, $v);
+			}
+		} else {
+			$val = str_replace($replace, $replace_with, $val);
+		}
+
+		return $val;
+	}
+
+	public static function get_us_states() {
+		return apply_filters( 'frm_us_states', array(
+			'AL' => 'Alabama', 'AK' => 'Alaska', 'AR' => 'Arkansas', 'AZ' => 'Arizona',
+			'CA' => 'California', 'CO' => 'Colorado', 'CT' => 'Connecticut', 'DE' => 'Delaware',
+			'DC' => 'District of Columbia',
+			'FL' => 'Florida', 'GA' => 'Georgia', 'HI' => 'Hawaii', 'ID' => 'Idaho',
+			'IL' => 'Illinois', 'IN' => 'Indiana', 'IA' => 'Iowa', 'KS' => 'Kansas',
+			'KY' => 'Kentucky', 'LA' => 'Louisiana', 'ME' => 'Maine','MD' => 'Maryland',
+			'MA' => 'Massachusetts', 'MI' => 'Michigan', 'MN' => 'Minnesota', 'MS' => 'Mississippi',
+			'MO' => 'Missouri', 'MT' => 'Montana', 'NE' => 'Nebraska', 'NV' => 'Nevada',
+			'NH' => 'New Hampshire', 'NJ' => 'New Jersey', 'NM' => 'New Mexico', 'NY' => 'New York',
+			'NC' => 'North Carolina', 'ND' => 'North Dakota', 'OH' => 'Ohio', 'OK' => 'Oklahoma',
+			'OR' => 'Oregon', 'PA' => 'Pennsylvania', 'RI' => 'Rhode Island', 'SC' => 'South Carolina',
+			'SD' => 'South Dakota', 'TN' => 'Tennessee', 'TX' => 'Texas', 'UT' => 'Utah',
+			'VT' => 'Vermont', 'VA' => 'Virginia', 'WA' => 'Washington', 'WV' => 'West Virginia',
+			'WI' => 'Wisconsin', 'WY' => 'Wyoming',
+		) );
+	}
+
+	public static function get_countries() {
+		return apply_filters( 'frm_countries', array(
+			__( 'Afghanistan', 'formidable' ), __( 'Albania', 'formidable' ), __( 'Algeria', 'formidable' ),
+			__( 'American Samoa', 'formidable' ), __( 'Andorra', 'formidable' ), __( 'Angola', 'formidable' ),
+			__( 'Anguilla', 'formidable' ), __( 'Antarctica', 'formidable' ), __( 'Antigua and Barbuda', 'formidable' ),
+			__( 'Argentina', 'formidable' ), __( 'Armenia', 'formidable' ), __( 'Aruba', 'formidable' ),
+			__( 'Australia', 'formidable' ), __( 'Austria', 'formidable' ), __( 'Azerbaijan', 'formidable' ),
+			__( 'Bahamas', 'formidable' ), __( 'Bahrain', 'formidable' ), __( 'Bangladesh', 'formidable' ),
+			__( 'Barbados', 'formidable' ), __( 'Belarus', 'formidable' ), __( 'Belgium', 'formidable' ),
+			__( 'Belize', 'formidable' ), __( 'Benin', 'formidable' ), __( 'Bermuda', 'formidable' ),
+			__( 'Bhutan', 'formidable' ), __( 'Bolivia', 'formidable' ), __( 'Bosnia and Herzegovina', 'formidable' ),
+			__( 'Botswana', 'formidable' ), __( 'Brazil', 'formidable' ), __( 'Brunei', 'formidable' ),
+			__( 'Bulgaria', 'formidable' ), __( 'Burkina Faso', 'formidable' ), __( 'Burundi', 'formidable' ),
+			__( 'Cambodia', 'formidable' ), __( 'Cameroon', 'formidable' ), __( 'Canada', 'formidable' ),
+			__( 'Cape Verde', 'formidable' ), __( 'Cayman Islands', 'formidable' ), __( 'Central African Republic', 'formidable' ),
+			__( 'Chad', 'formidable' ), __( 'Chile', 'formidable' ), __( 'China', 'formidable' ),
+			__( 'Colombia', 'formidable' ), __( 'Comoros', 'formidable' ), __( 'Congo', 'formidable' ),
+			__( 'Costa Rica', 'formidable' ), __( 'C&ocirc;te d\'Ivoire', 'formidable' ), __( 'Croatia', 'formidable' ),
+			__( 'Cuba', 'formidable' ), __( 'Cyprus', 'formidable' ), __( 'Czech Republic', 'formidable' ),
+			__( 'Denmark', 'formidable' ), __( 'Djibouti', 'formidable' ), __( 'Dominica', 'formidable' ),
+			__( 'Dominican Republic', 'formidable' ), __( 'East Timor', 'formidable' ), __( 'Ecuador', 'formidable' ),
+			__( 'Egypt', 'formidable' ), __( 'El Salvador', 'formidable' ), __( 'Equatorial Guinea', 'formidable' ),
+			__( 'Eritrea', 'formidable' ), __( 'Estonia', 'formidable' ), __( 'Ethiopia', 'formidable' ),
+			__( 'Fiji', 'formidable' ), __( 'Finland', 'formidable' ), __( 'France', 'formidable' ),
+			__( 'French Guiana', 'formidable' ), __( 'French Polynesia', 'formidable' ), __( 'Gabon', 'formidable' ),
+			__( 'Gambia', 'formidable' ), __( 'Georgia', 'formidable' ), __( 'Germany', 'formidable' ),
+			__( 'Ghana', 'formidable' ), __( 'Gibraltar', 'formidable' ), __( 'Greece', 'formidable' ),
+			__( 'Greenland', 'formidable' ), __( 'Grenada', 'formidable' ), __( 'Guam', 'formidable' ),
+			__( 'Guatemala', 'formidable' ), __( 'Guinea', 'formidable' ), __( 'Guinea-Bissau', 'formidable' ),
+			__( 'Guyana', 'formidable' ), __( 'Haiti', 'formidable' ), __( 'Honduras', 'formidable' ),
+			__( 'Hong Kong', 'formidable' ), __( 'Hungary', 'formidable' ), __( 'Iceland', 'formidable' ),
+			__( 'India', 'formidable' ), __( 'Indonesia', 'formidable' ), __( 'Iran', 'formidable' ),
+			__( 'Iraq', 'formidable' ), __( 'Ireland', 'formidable' ), __( 'Israel', 'formidable' ),
+			__( 'Italy', 'formidable' ), __( 'Jamaica', 'formidable' ), __( 'Japan', 'formidable' ),
+			__( 'Jordan', 'formidable' ), __( 'Kazakhstan', 'formidable' ), __( 'Kenya', 'formidable' ),
+			__( 'Kiribati', 'formidable' ), __( 'North Korea', 'formidable' ), __( 'South Korea', 'formidable' ),
+			__( 'Kuwait', 'formidable' ), __( 'Kyrgyzstan', 'formidable' ), __( 'Laos', 'formidable' ),
+			__( 'Latvia', 'formidable' ), __( 'Lebanon', 'formidable' ), __( 'Lesotho', 'formidable' ),
+			__( 'Liberia', 'formidable' ), __( 'Libya', 'formidable' ), __( 'Liechtenstein', 'formidable' ),
+			__( 'Lithuania', 'formidable' ), __( 'Luxembourg', 'formidable' ), __( 'Macedonia', 'formidable' ),
+			__( 'Madagascar', 'formidable' ), __( 'Malawi', 'formidable' ), __( 'Malaysia', 'formidable' ),
+			__( 'Maldives', 'formidable' ), __( 'Mali', 'formidable' ), __( 'Malta', 'formidable' ),
+			__( 'Marshall Islands', 'formidable' ), __( 'Mauritania', 'formidable' ), __( 'Mauritius', 'formidable' ),
+			__( 'Mexico', 'formidable' ), __( 'Micronesia', 'formidable' ), __( 'Moldova', 'formidable' ),
+			__( 'Monaco', 'formidable' ), __( 'Mongolia', 'formidable' ), __( 'Montenegro', 'formidable' ),
+			__( 'Montserrat', 'formidable' ), __( 'Morocco', 'formidable' ), __( 'Mozambique', 'formidable' ),
+			__( 'Myanmar', 'formidable' ), __( 'Namibia', 'formidable' ), __( 'Nauru', 'formidable' ),
+			__( 'Nepal', 'formidable' ), __( 'Netherlands', 'formidable' ), __( 'New Zealand', 'formidable' ),
+			__( 'Nicaragua', 'formidable' ), __( 'Niger', 'formidable' ), __( 'Nigeria', 'formidable' ),
+			__( 'Norway', 'formidable' ), __( 'Northern Mariana Islands', 'formidable' ), __( 'Oman', 'formidable' ),
+			__( 'Pakistan', 'formidable' ), __( 'Palau', 'formidable' ), __( 'Palestine', 'formidable' ),
+			__( 'Panama', 'formidable' ), __( 'Papua New Guinea', 'formidable' ), __( 'Paraguay', 'formidable' ),
+			__( 'Peru', 'formidable' ), __( 'Philippines', 'formidable' ), __( 'Poland', 'formidable' ),
+			__( 'Portugal', 'formidable' ), __( 'Puerto Rico', 'formidable' ), __( 'Qatar', 'formidable' ),
+			__( 'Romania', 'formidable' ), __( 'Russia', 'formidable' ), __( 'Rwanda', 'formidable' ),
+			__( 'Saint Kitts and Nevis', 'formidable' ), __( 'Saint Lucia', 'formidable' ),
+			__( 'Saint Vincent and the Grenadines', 'formidable' ), __( 'Samoa', 'formidable' ),
+			__( 'San Marino', 'formidable' ), __( 'Sao Tome and Principe', 'formidable' ), __( 'Saudi Arabia', 'formidable' ),
+			__( 'Senegal', 'formidable' ), __( 'Serbia and Montenegro', 'formidable' ), __( 'Seychelles', 'formidable' ),
+			__( 'Sierra Leone', 'formidable' ), __( 'Singapore', 'formidable' ), __( 'Slovakia', 'formidable' ),
+			__( 'Slovenia', 'formidable' ), __( 'Solomon Islands', 'formidable' ), __( 'Somalia', 'formidable' ),
+			__( 'South Africa', 'formidable' ), __( 'South Sudan', 'formidable' ),
+			__( 'Spain', 'formidable' ), __( 'Sri Lanka', 'formidable' ),
+			__( 'Sudan', 'formidable' ), __( 'Suriname', 'formidable' ), __( 'Swaziland', 'formidable' ),
+			__( 'Sweden', 'formidable' ), __( 'Switzerland', 'formidable' ), __( 'Syria', 'formidable' ),
+			__( 'Taiwan', 'formidable' ), __( 'Tajikistan', 'formidable' ), __( 'Tanzania', 'formidable' ),
+			__( 'Thailand', 'formidable' ), __( 'Togo', 'formidable' ), __( 'Tonga', 'formidable' ),
+			__( 'Trinidad and Tobago', 'formidable' ), __( 'Tunisia', 'formidable' ), __( 'Turkey', 'formidable' ),
+			__( 'Turkmenistan', 'formidable' ), __( 'Tuvalu', 'formidable' ), __( 'Uganda', 'formidable' ),
+			__( 'Ukraine', 'formidable' ), __( 'United Arab Emirates', 'formidable' ), __( 'United Kingdom', 'formidable' ),
+			__( 'United States', 'formidable' ), __( 'Uruguay', 'formidable' ), __( 'Uzbekistan', 'formidable' ),
+			__( 'Vanuatu', 'formidable' ), __( 'Vatican City', 'formidable' ), __( 'Venezuela', 'formidable' ),
+			__( 'Vietnam', 'formidable' ), __( 'Virgin Islands, British', 'formidable' ),
+			__( 'Virgin Islands, U.S.', 'formidable' ), __( 'Yemen', 'formidable' ), __( 'Zambia', 'formidable' ),
+			__( 'Zimbabwe', 'formidable' ),
+		) );
+	}
 
 	public static function get_bulk_prefilled_opts( array &$prepop ) {
 		$prepop[ __( 'Countries', 'formidable' ) ] = FrmFieldsHelper::get_countries();
 
-        $states = FrmFieldsHelper::get_us_states();
-        $state_abv = array_keys($states);
-        sort($state_abv);
+		$states = FrmFieldsHelper::get_us_states();
+		$state_abv = array_keys($states);
+		sort($state_abv);
 		$prepop[ __( 'U.S. State Abbreviations', 'formidable' ) ] = $state_abv;
 
-        $states = array_values($states);
-        sort($states);
+		$states = array_values($states);
+		sort($states);
 		$prepop[ __( 'U.S. States', 'formidable' ) ] = $states;
-        unset($state_abv, $states);
+		unset($state_abv, $states);
 
 		$prepop[ __( 'Age', 'formidable' ) ] = array(
-            __( 'Under 18', 'formidable' ), __( '18-24', 'formidable' ), __( '25-34', 'formidable' ),
-            __( '35-44', 'formidable' ), __( '45-54', 'formidable' ), __( '55-64', 'formidable' ),
-            __( '65 or Above', 'formidable' ), __( 'Prefer Not to Answer', 'formidable' ),
-        );
+			__( 'Under 18', 'formidable' ), __( '18-24', 'formidable' ), __( '25-34', 'formidable' ),
+			__( '35-44', 'formidable' ), __( '45-54', 'formidable' ), __( '55-64', 'formidable' ),
+			__( '65 or Above', 'formidable' ), __( 'Prefer Not to Answer', 'formidable' ),
+		);
 
 		$prepop[ __( 'Satisfaction', 'formidable' ) ] = array(
-            __( 'Very Satisfied', 'formidable' ), __( 'Satisfied', 'formidable' ), __( 'Neutral', 'formidable' ),
-            __( 'Unsatisfied', 'formidable' ), __( 'Very Unsatisfied', 'formidable' ), __( 'N/A', 'formidable' ),
-        );
+			__( 'Very Satisfied', 'formidable' ), __( 'Satisfied', 'formidable' ), __( 'Neutral', 'formidable' ),
+			__( 'Unsatisfied', 'formidable' ), __( 'Very Unsatisfied', 'formidable' ), __( 'N/A', 'formidable' ),
+		);
 
 		$prepop[ __( 'Importance', 'formidable' ) ] = array(
-            __( 'Very Important', 'formidable' ), __( 'Important', 'formidable' ), __( 'Neutral', 'formidable' ),
-            __( 'Somewhat Important', 'formidable' ), __( 'Not at all Important', 'formidable' ), __( 'N/A', 'formidable' ),
-        );
+			__( 'Very Important', 'formidable' ), __( 'Important', 'formidable' ), __( 'Neutral', 'formidable' ),
+			__( 'Somewhat Important', 'formidable' ), __( 'Not at all Important', 'formidable' ), __( 'N/A', 'formidable' ),
+		);
 
 		$prepop[ __( 'Agreement', 'formidable' ) ] = array(
-            __( 'Strongly Agree', 'formidable' ), __( 'Agree', 'formidable' ), __( 'Neutral', 'formidable' ),
-            __( 'Disagree', 'formidable' ), __( 'Strongly Disagree', 'formidable' ), __( 'N/A', 'formidable' ),
-        );
+			__( 'Strongly Agree', 'formidable' ), __( 'Agree', 'formidable' ), __( 'Neutral', 'formidable' ),
+			__( 'Disagree', 'formidable' ), __( 'Strongly Disagree', 'formidable' ), __( 'N/A', 'formidable' ),
+		);
 
 		$prepop = apply_filters( 'frm_bulk_field_choices', $prepop );
-    }
+	}
 
 	public static function field_selection() {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmField::field_selection' );
@@ -1402,8 +1402,8 @@ 
 		return FrmField::is_required( $field );
 	}
 
-    public static function maybe_get_field( &$field ) {
+	public static function maybe_get_field( &$field ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmField::maybe_get_field' );
 		FrmField::maybe_get_field( $field );
-    }
+	}
 }

Spacing +221 added lines, -221 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -7,12 +7,12 @@ 
 
 	public static function setup_new_vars( $type = '', $form_id = '' ) {
 
-        if ( strpos($type, '|') ) {
-            list($type, $setting) = explode('|', $type);
+        if ( strpos( $type, '|' ) ) {
+            list( $type, $setting ) = explode( '|', $type );
         }
 
-        $defaults = self::get_default_field_opts($type, $form_id);
-        $defaults['field_options']['custom_html'] = self::get_default_html($type);
+        $defaults = self::get_default_field_opts( $type, $form_id );
+        $defaults['field_options']['custom_html'] = self::get_default_html( $type );
 
         $values = array();
 
@@ -20,20 +20,20 @@ 
             if ( $var == 'field_options' ) {
                 $values['field_options'] = array();
                 foreach ( $default as $opt_var => $opt_default ) {
-                    $values['field_options'][ $opt_var ] = $opt_default;
-                    unset($opt_var, $opt_default);
+                    $values['field_options'][$opt_var] = $opt_default;
+                    unset( $opt_var, $opt_default );
                 }
             } else {
-                $values[ $var ] = $default;
+                $values[$var] = $default;
             }
-            unset($var, $default);
+            unset( $var, $default );
         }
 
         if ( isset( $setting ) && ! empty( $setting ) ) {
             if ( 'data' == $type ) {
                 $values['field_options']['data_type'] = $setting;
             } else {
-                $values['field_options'][ $setting ] = 1;
+                $values['field_options'][$setting] = 1;
             }
         }
 
@@ -56,19 +56,19 @@ 
         }
 
 		$fields = FrmField::field_selection();
-        $fields = array_merge($fields, FrmField::pro_field_selection());
+        $fields = array_merge( $fields, FrmField::pro_field_selection() );
 
-        if ( isset( $fields[ $type ] ) ) {
-            $values['name'] = is_array( $fields[ $type ] ) ? $fields[ $type ]['name'] : $fields[ $type ];
+        if ( isset( $fields[$type] ) ) {
+            $values['name'] = is_array( $fields[$type] ) ? $fields[$type]['name'] : $fields[$type];
         }
 
-        unset($fields);
+        unset( $fields );
 
         return $values;
     }
 
 	public static function get_html_id( $field, $plus = '' ) {
-        return apply_filters('frm_field_html_id', 'field_'. $field['field_key'] . $plus, $field);
+        return apply_filters( 'frm_field_html_id', 'field_' . $field['field_key'] . $plus, $field );
     }
 
     public static function setup_edit_vars( $record, $doing_ajax = false ) {
@@ -88,8 +88,8 @@ 
             $values['form_name'] = '';
 		} else {
 			foreach ( $defaults as $var => $default ) {
-                $values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'htmlspecialchars' );
-                unset($var, $default);
+                $values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'htmlspecialchars' );
+                unset( $var, $default );
             }
 
 			$values['form_name'] = $record->form_id ? FrmForm::getName( $record->form_id ) : '';
@@ -100,7 +100,7 @@ 
         $values['options'] = $record->options;
         $values['field_options'] = $record->field_options;
 
-        $defaults = self::get_default_field_opts($values['type'], $record, true);
+        $defaults = self::get_default_field_opts( $values['type'], $record, true );
 
 		if ( $values['type'] == 'captcha' ) {
             $frm_settings = FrmAppHelper::get_settings();
@@ -108,11 +108,11 @@ 
         }
 
 		foreach ( $defaults as $opt => $default ) {
-            $values[ $opt ] = isset( $record->field_options[ $opt ] ) ? $record->field_options[ $opt ] : $default;
-            unset($opt, $default);
+            $values[$opt] = isset( $record->field_options[$opt] ) ? $record->field_options[$opt] : $default;
+            unset( $opt, $default );
         }
 
-        $values['custom_html'] = (isset($record->field_options['custom_html'])) ? $record->field_options['custom_html'] : self::get_default_html($record->type);
+        $values['custom_html'] = ( isset( $record->field_options['custom_html'] ) ) ? $record->field_options['custom_html'] : self::get_default_html( $record->type );
 
 		return apply_filters( 'frm_setup_edit_field_vars', $values, array( 'doing_ajax' => $doing_ajax ) );
     }
@@ -131,9 +131,9 @@ 
 
         global $wpdb;
 
-        $form_id = (is_numeric($field)) ? $field : $field->form_id;
+        $form_id = ( is_numeric( $field ) ) ? $field : $field->form_id;
 
-        $key = is_numeric($field) ? FrmAppHelper::get_unique_key('', $wpdb->prefix .'frm_fields', 'field_key') : $field->field_key;
+        $key = is_numeric( $field ) ? FrmAppHelper::get_unique_key( '', $wpdb->prefix . 'frm_fields', 'field_key' ) : $field->field_key;
 
         $field_count = FrmDb::get_var( 'frm_fields', array( 'form_id' => $form_id ), 'field_order', array( 'order_by' => 'field_order DESC' ) );
 
@@ -151,13 +151,13 @@ 
     public static function fill_field( &$values, $field, $form_id, $new_key = '' ) {
         global $wpdb;
 
-        $values['field_key'] = FrmAppHelper::get_unique_key($new_key, $wpdb->prefix .'frm_fields', 'field_key');
+        $values['field_key'] = FrmAppHelper::get_unique_key( $new_key, $wpdb->prefix . 'frm_fields', 'field_key' );
         $values['form_id'] = $form_id;
-        $values['options'] = maybe_serialize($field->options);
-        $values['default_value'] = maybe_serialize($field->default_value);
+        $values['options'] = maybe_serialize( $field->options );
+        $values['default_value'] = maybe_serialize( $field->default_value );
 
         foreach ( array( 'name', 'description', 'type', 'field_order', 'field_options', 'required' ) as $col ) {
-            $values[ $col ] = $field->{$col};
+            $values[$col] = $field->{$col};
         }
     }
 
@@ -170,19 +170,19 @@ 
 		$field_name = is_array( $field ) ? $field['name'] : $field->name;
 
 		$defaults = array(
-			'unique_msg' => array( 'full' => $default_settings['unique_msg'], 'part' => sprintf( __('%s must be unique', 'formidable' ), $field_name ) ),
-			'invalid'   => array( 'full' => __( 'This field is invalid', 'formidable' ), 'part' => sprintf( __('%s is invalid', 'formidable' ), $field_name ) ),
+			'unique_msg' => array( 'full' => $default_settings['unique_msg'], 'part' => sprintf( __( '%s must be unique', 'formidable' ), $field_name ) ),
+			'invalid'   => array( 'full' => __( 'This field is invalid', 'formidable' ), 'part' => sprintf( __( '%s is invalid', 'formidable' ), $field_name ) ),
 			'blank'     => array( 'full' => $frm_settings->blank_msg, 'part' => $frm_settings->blank_msg ),
 		);
 
 		$msg = FrmField::get_option( $field, $error );
-		$msg = ( $msg == $defaults[ $error ]['full'] || empty( $msg ) ) ? $defaults[ $error ]['part'] : $msg;
+		$msg = ( $msg == $defaults[$error]['full'] || empty( $msg ) ) ? $defaults[$error]['part'] : $msg;
 		return $msg;
 	}
 
     public static function get_form_fields( $form_id, $error = false ) {
-        $fields = FrmField::get_all_for_form($form_id);
-        $fields = apply_filters('frm_get_paged_fields', $fields, $form_id, $error);
+        $fields = FrmField::get_all_for_form( $form_id );
+        $fields = apply_filters( 'frm_get_paged_fields', $fields, $form_id, $error );
         return $fields;
     }
 
@@ -205,57 +205,57 @@ 
 </div>
 DEFAULT_HTML;
         } else {
-			$default_html = apply_filters('frm_other_custom_html', '', $type);
+			$default_html = apply_filters( 'frm_other_custom_html', '', $type );
         }
 
-        return apply_filters('frm_custom_html', $default_html, $type);
+        return apply_filters( 'frm_custom_html', $default_html, $type );
     }
 
 	public static function replace_shortcodes( $html, $field, $errors = array(), $form = false, $args = array() ) {
-        $html = apply_filters('frm_before_replace_shortcodes', $html, $field, $errors, $form);
+        $html = apply_filters( 'frm_before_replace_shortcodes', $html, $field, $errors, $form );
 
         $defaults = array(
-            'field_name'  => 'item_meta['. $field['id'] .']',
+            'field_name'  => 'item_meta[' . $field['id'] . ']',
             'field_id'    => $field['id'],
             'field_plus_id' => '',
             'section_id'    => '',
         );
-        $args = wp_parse_args($args, $defaults);
+        $args = wp_parse_args( $args, $defaults );
         $field_name = $args['field_name'];
         $field_id = $args['field_id'];
-        $html_id = self::get_html_id($field, $args['field_plus_id']);
+        $html_id = self::get_html_id( $field, $args['field_plus_id'] );
 
-        if ( FrmField::is_multiple_select($field) ) {
+        if ( FrmField::is_multiple_select( $field ) ) {
             $field_name .= '[]';
         }
 
         //replace [id]
-        $html = str_replace('[id]', $field_id, $html);
+        $html = str_replace( '[id]', $field_id, $html );
 
         // Remove the for attribute for captcha
         if ( $field['type'] == 'captcha' ) {
-            $html = str_replace(' for="field_[key]"', '', $html);
+            $html = str_replace( ' for="field_[key]"', '', $html );
         }
 
         // set the label for
-        $html = str_replace('field_[key]', $html_id, $html);
+        $html = str_replace( 'field_[key]', $html_id, $html );
 
         //replace [key]
-        $html = str_replace('[key]', $field['field_key'], $html);
+        $html = str_replace( '[key]', $field['field_key'], $html );
 
         //replace [description] and [required_label] and [error]
 		$required = FrmField::is_required( $field ) ? $field['required_indicator'] : '';
         if ( ! is_array( $errors ) ) {
             $errors = array();
         }
-		$error = isset( $errors[ 'field' . $field_id ] ) ? $errors[ 'field' . $field_id ] : false;
+		$error = isset( $errors['field' . $field_id] ) ? $errors['field' . $field_id] : false;
 
         //If field type is section heading, add class so a bottom margin can be added to either the h3 or description
         if ( $field['type'] == 'divider' ) {
             if ( FrmField::is_option_true( $field, 'description' ) ) {
                 $html = str_replace( 'frm_description', 'frm_description frm_section_spacing', $html );
             } else {
-                $html = str_replace('[label_position]', '[label_position] frm_section_spacing', $html);
+                $html = str_replace( '[label_position]', '[label_position] frm_section_spacing', $html );
             }
         }
 
@@ -265,83 +265,83 @@ 
 
         //replace [required_class]
 		$required_class = FrmField::is_required( $field ) ? ' frm_required_field' : '';
-        $html = str_replace('[required_class]', $required_class, $html);
+        $html = str_replace( '[required_class]', $required_class, $html );
 
         //replace [label_position]
-        $field['label'] = apply_filters('frm_html_label_position', $field['label'], $field, $form);
+        $field['label'] = apply_filters( 'frm_html_label_position', $field['label'], $field, $form );
         $field['label'] = ( $field['label'] && $field['label'] != '' ) ? $field['label'] : 'top';
 		$html = str_replace( '[label_position]', ( ( in_array( $field['type'], array( 'divider', 'end_divider', 'break' ) ) ) ? $field['label'] : ' frm_primary_label' ), $html );
 
         //replace [field_name]
-        $html = str_replace('[field_name]', $field['name'], $html);
+        $html = str_replace( '[field_name]', $field['name'], $html );
 
         //replace [error_class]
-		$error_class = isset( $errors[ 'field' . $field_id ] ) ? ' frm_blank_field' : '';
+		$error_class = isset( $errors['field' . $field_id] ) ? ' frm_blank_field' : '';
 		self::get_more_field_classes( $error_class, $field, $field_id, $html );
 		if ( $field['type'] == 'html' && strpos( $html, '[error_class]' ) === false ) {
 			// there is no error_class shortcode to use for addign fields
 			$html = str_replace( 'class="frm_form_field', 'class="frm_form_field ' . $error_class, $html );
 		}
-        $html = str_replace('[error_class]', $error_class, $html);
+        $html = str_replace( '[error_class]', $error_class, $html );
 
         //replace [entry_key]
         $entry_key = FrmAppHelper::simple_get( 'entry', 'sanitize_title' );
-        $html = str_replace('[entry_key]', $entry_key, $html);
+        $html = str_replace( '[entry_key]', $entry_key, $html );
 
         //replace [input]
-        preg_match_all("/\[(input|deletelink)\b(.*?)(?:(\/))?\]/s", $html, $shortcodes, PREG_PATTERN_ORDER);
+        preg_match_all( "/\[(input|deletelink)\b(.*?)(?:(\/))?\]/s", $html, $shortcodes, PREG_PATTERN_ORDER );
         global $frm_vars;
         $frm_settings = FrmAppHelper::get_settings();
 
         foreach ( $shortcodes[0] as $short_key => $tag ) {
-            $atts = shortcode_parse_atts( $shortcodes[2][ $short_key ] );
+            $atts = shortcode_parse_atts( $shortcodes[2][$short_key] );
 			$tag = self::get_shortcode_tag( $shortcodes, $short_key, array( 'conditional' => false, 'conditional_check' => false ) );
 
             $replace_with = '';
 
             if ( $tag == 'input' ) {
-                if ( isset($atts['opt']) ) {
-                    $atts['opt']--;
+                if ( isset( $atts['opt'] ) ) {
+                    $atts['opt'] --;
                 }
 
-                $field['input_class'] = isset($atts['class']) ? $atts['class'] : '';
-                if ( isset($atts['class']) ) {
-                    unset($atts['class']);
+                $field['input_class'] = isset( $atts['class'] ) ? $atts['class'] : '';
+                if ( isset( $atts['class'] ) ) {
+                    unset( $atts['class'] );
                 }
 
                 $field['shortcodes'] = $atts;
                 ob_start();
-                include(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/input.php');
+                include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/input.php' );
                 $replace_with = ob_get_contents();
                 ob_end_clean();
             } else if ( $tag == 'deletelink' && FrmAppHelper::pro_is_installed() ) {
-                $replace_with = FrmProEntriesController::entry_delete_link($atts);
+                $replace_with = FrmProEntriesController::entry_delete_link( $atts );
             }
 
-            $html = str_replace( $shortcodes[0][ $short_key ], $replace_with, $html );
+            $html = str_replace( $shortcodes[0][$short_key], $replace_with, $html );
         }
 
 		if ( $form ) {
             $form = (array) $form;
 
             //replace [form_key]
-            $html = str_replace('[form_key]', $form['form_key'], $html);
+            $html = str_replace( '[form_key]', $form['form_key'], $html );
 
             //replace [form_name]
-            $html = str_replace('[form_name]', $form['name'], $html);
+            $html = str_replace( '[form_name]', $form['name'], $html );
         }
         $html .= "\n";
 
         //Return html if conf_field to prevent loop
-        if ( isset($field['conf_field']) && $field['conf_field'] == 'stop' ) {
+        if ( isset( $field['conf_field'] ) && $field['conf_field'] == 'stop' ) {
             return $html;
         }
 
         //If field is in repeating section
         if ( $args['section_id'] ) {
-            $html = apply_filters('frm_replace_shortcodes', $html, $field, array( 'errors' => $errors, 'form' => $form, 'field_name' => $field_name, 'field_id' => $field_id, 'field_plus_id' => $args['field_plus_id'], 'section_id' => $args['section_id'] ));
+            $html = apply_filters( 'frm_replace_shortcodes', $html, $field, array( 'errors' => $errors, 'form' => $form, 'field_name' => $field_name, 'field_id' => $field_id, 'field_plus_id' => $args['field_plus_id'], 'section_id' => $args['section_id'] ) );
         } else {
-            $html = apply_filters('frm_replace_shortcodes', $html, $field, array( 'errors' => $errors, 'form' => $form ));
+            $html = apply_filters( 'frm_replace_shortcodes', $html, $field, array( 'errors' => $errors, 'form' => $form ) );
         }
 
 		self::remove_collapse_shortcode( $html );
@@ -363,10 +363,10 @@ 
 	* @param $html string
 	*/
 	private static function get_more_field_classes( &$error_class, $field, $field_id, $html ) {
-		$error_class .= ' frm_'. $field['label'] .'_container';
+		$error_class .= ' frm_' . $field['label'] . '_container';
 		if ( $field['id'] != $field_id ) {
 			// add a class for repeating/embedded fields
-			$error_class .= ' frm_field_'. $field['id'] .'_container';
+			$error_class .= ' frm_field_' . $field['id'] . '_container';
 		}
 
 		// Add class to embedded form field
@@ -418,22 +418,22 @@ 
 
 		//insert custom CSS classes
 		if ( ! empty( $field['classes'] ) ) {
-			if ( ! strpos( $html, 'frm_form_field ') ) {
+			if ( ! strpos( $html, 'frm_form_field ' ) ) {
 				$error_class .= ' frm_form_field';
 			}
-			$error_class .= ' '. $field['classes'];
+			$error_class .= ' ' . $field['classes'];
 		}
 	}
 
     public static function remove_inline_conditions( $no_vars, $code, $replace_with, &$html ) {
         if ( $no_vars ) {
-            $html = str_replace( '[if '. $code.']', '', $html );
-    	    $html = str_replace( '[/if '. $code.']', '', $html );
+            $html = str_replace( '[if ' . $code . ']', '', $html );
+    	    $html = str_replace( '[/if ' . $code . ']', '', $html );
         } else {
-            $html = preg_replace( '/(\[if\s+'. $code .'\])(.*?)(\[\/if\s+'. $code .'\])/mis', '', $html );
+            $html = preg_replace( '/(\[if\s+' . $code . '\])(.*?)(\[\/if\s+' . $code . '\])/mis', '', $html );
         }
 
-        $html = str_replace( '['. $code .']', $replace_with, $html );
+        $html = str_replace( '[' . $code . ']', $replace_with, $html );
     }
 
 	public static function get_shortcode_tag( $shortcodes, $short_key, $args ) {
@@ -452,15 +452,15 @@ 
         }
 
         $with_tags = $args['conditional_check'] ? 3 : 2;
-        if ( ! empty( $shortcodes[ $with_tags ][ $short_key ] ) ) {
-            $tag = str_replace( '[' . $prefix, '', $shortcodes[0][ $short_key ] );
-            $tag = str_replace(']', '', $tag);
-            $tags = explode(' ', $tag);
-            if ( is_array($tags) ) {
+        if ( ! empty( $shortcodes[$with_tags][$short_key] ) ) {
+            $tag = str_replace( '[' . $prefix, '', $shortcodes[0][$short_key] );
+            $tag = str_replace( ']', '', $tag );
+            $tags = explode( ' ', $tag );
+            if ( is_array( $tags ) ) {
                 $tag = $tags[0];
             }
         } else {
-            $tag = $shortcodes[ $with_tags - 1 ][ $short_key ];
+            $tag = $shortcodes[$with_tags - 1][$short_key];
         }
 
         return $tag;
@@ -478,16 +478,16 @@ 
 
 	public static function display_recaptcha( $field ) {
         $frm_settings = FrmAppHelper::get_settings();
-        $lang = apply_filters('frm_recaptcha_lang', $frm_settings->re_lang, $field);
+        $lang = apply_filters( 'frm_recaptcha_lang', $frm_settings->re_lang, $field );
 
         $api_js_url = 'https://www.google.com/recaptcha/api.js?onload=frmRecaptcha&render=explicit';
         if ( $lang != 'en' ) {
-            $api_js_url .= '&hl='. $lang;
+            $api_js_url .= '&hl=' . $lang;
         }
-        $api_js_url = apply_filters('frm_recpatcha_js_url', $api_js_url);
+        $api_js_url = apply_filters( 'frm_recpatcha_js_url', $api_js_url );
 
-        wp_register_script('recaptcha-api', $api_js_url, '', true);
-        wp_enqueue_script('recaptcha-api');
+        wp_register_script( 'recaptcha-api', $api_js_url, '', true );
+        wp_enqueue_script( 'recaptcha-api' );
 
 ?>
 <div id="field_<?php echo esc_attr( $field['field_key'] ) ?>" class="frm-g-recaptcha" data-sitekey="<?php echo esc_attr( $frm_settings->pubkey ) ?>" data-size="<?php echo esc_attr( $field['captcha_size'] ) ?>"></div>
@@ -496,45 +496,45 @@ 
 
 	public static function show_single_option( $field ) {
         $field_name = $field['name'];
-        $html_id = self::get_html_id($field);
+        $html_id = self::get_html_id( $field );
         foreach ( $field['options'] as $opt_key => $opt ) {
-            $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-            $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
+            $field_val = apply_filters( 'frm_field_value_saved', $opt, $opt_key, $field );
+            $opt = apply_filters( 'frm_field_label_seen', $opt, $opt_key, $field );
 
             // If this is an "Other" option, get the HTML for it
 			if ( self::is_other_opt( $opt_key ) ) {
                 // Get string for Other text field, if needed
 				$other_val = self::get_other_val( compact( 'opt_key', 'field' ) );
-                require(FrmAppHelper::plugin_path() .'/pro/classes/views/frmpro-fields/other-option.php');
+                require( FrmAppHelper::plugin_path() . '/pro/classes/views/frmpro-fields/other-option.php' );
             } else {
-                require(FrmAppHelper::plugin_path() .'/classes/views/frm-fields/single-option.php');
+                require( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/single-option.php' );
             }
         }
     }
 
 	public static function dropdown_categories( $args ) {
 		$defaults = array( 'field' => false, 'name' => false, 'show_option_all' => ' ' );
-        $args = wp_parse_args($args, $defaults);
+        $args = wp_parse_args( $args, $defaults );
 
         if ( ! $args['field'] ) {
             return;
         }
 
         if ( ! $args['name'] ) {
-            $args['name'] = 'item_meta['. $args['field']['id'] .']';
+            $args['name'] = 'item_meta[' . $args['field']['id'] . ']';
         }
 
-        $id = self::get_html_id($args['field']);
+        $id = self::get_html_id( $args['field'] );
         $class = $args['field']['type'];
 
-        $exclude = (is_array($args['field']['exclude_cat'])) ? implode(',', $args['field']['exclude_cat']) : $args['field']['exclude_cat'];
-        $exclude = apply_filters('frm_exclude_cats', $exclude, $args['field']);
+        $exclude = ( is_array( $args['field']['exclude_cat'] ) ) ? implode( ',', $args['field']['exclude_cat'] ) : $args['field']['exclude_cat'];
+        $exclude = apply_filters( 'frm_exclude_cats', $exclude, $args['field'] );
 
-        if ( is_array($args['field']['value']) ) {
-            if ( ! empty($exclude) ) {
-                $args['field']['value'] = array_diff($args['field']['value'], explode(',', $exclude));
+        if ( is_array( $args['field']['value'] ) ) {
+            if ( ! empty( $exclude ) ) {
+                $args['field']['value'] = array_diff( $args['field']['value'], explode( ',', $exclude ) );
             }
-            $selected = reset($args['field']['value']);
+            $selected = reset( $args['field']['value'] );
         } else {
             $selected = $args['field']['value'];
         }
@@ -545,40 +545,40 @@ 
             'hide_empty' => false, 'echo' => 0, 'orderby' => 'name',
         );
 
-        $tax_atts = apply_filters('frm_dropdown_cat', $tax_atts, $args['field']);
+        $tax_atts = apply_filters( 'frm_dropdown_cat', $tax_atts, $args['field'] );
 
         if ( FrmAppHelper::pro_is_installed() ) {
-            $post_type = FrmProFormsHelper::post_type($args['field']['form_id']);
-            $tax_atts['taxonomy'] = FrmProAppHelper::get_custom_taxonomy($post_type, $args['field']);
+            $post_type = FrmProFormsHelper::post_type( $args['field']['form_id'] );
+            $tax_atts['taxonomy'] = FrmProAppHelper::get_custom_taxonomy( $post_type, $args['field'] );
             if ( ! $tax_atts['taxonomy'] ) {
                 return;
             }
 
             // If field type is dropdown (not Dynamic), exclude children when parent is excluded
-            if ( $args['field']['type'] != 'data' && is_taxonomy_hierarchical($tax_atts['taxonomy']) ) {
+            if ( $args['field']['type'] != 'data' && is_taxonomy_hierarchical( $tax_atts['taxonomy'] ) ) {
                 $tax_atts['exclude_tree'] = $exclude;
             }
         }
 
-        $dropdown = wp_dropdown_categories($tax_atts);
+        $dropdown = wp_dropdown_categories( $tax_atts );
 
-        $add_html = FrmFieldsController::input_html($args['field'], false);
+        $add_html = FrmFieldsController::input_html( $args['field'], false );
 
         if ( FrmAppHelper::pro_is_installed() ) {
-            $add_html .= FrmProFieldsController::input_html($args['field'], false);
+            $add_html .= FrmProFieldsController::input_html( $args['field'], false );
         }
 
-		$dropdown = str_replace( "<select name='" . esc_attr( $args['name'] ) ."' id='" . esc_attr( $id ) . "' class='" . esc_attr( $class ) . "'", "<select name='" . esc_attr( $args['name'] ) . "' id='" . esc_attr( $id ) . "' " . $add_html, $dropdown );
+		$dropdown = str_replace( "<select name='" . esc_attr( $args['name'] ) . "' id='" . esc_attr( $id ) . "' class='" . esc_attr( $class ) . "'", "<select name='" . esc_attr( $args['name'] ) . "' id='" . esc_attr( $id ) . "' " . $add_html, $dropdown );
 
-        if ( is_array($args['field']['value']) ) {
+        if ( is_array( $args['field']['value'] ) ) {
             $skip = true;
             foreach ( $args['field']['value'] as $v ) {
 				if ( $skip ) {
                     $skip = false;
                     continue;
                 }
-				$dropdown = str_replace(' value="' . esc_attr( $v ) . '"', ' value="' . esc_attr( $v ) . '" selected="selected"', $dropdown );
-                unset($v);
+				$dropdown = str_replace( ' value="' . esc_attr( $v ) . '"', ' value="' . esc_attr( $v ) . '" selected="selected"', $dropdown );
+                unset( $v );
             }
         }
 
@@ -586,16 +586,16 @@ 
     }
 
 	public static function get_term_link( $tax_id ) {
-        $tax = get_taxonomy($tax_id);
+        $tax = get_taxonomy( $tax_id );
         if ( ! $tax ) {
             return;
         }
 
         $link = sprintf(
             __( 'Please add options from the WordPress "%1$s" page', 'formidable' ),
-            '<a href="'. esc_url( admin_url( 'edit-tags.php?taxonomy='. $tax->name ) ) .'" target="_blank">'. ( empty($tax->labels->name) ? __( 'Categories' ) : $tax->labels->name ) .'</a>'
+            '<a href="' . esc_url( admin_url( 'edit-tags.php?taxonomy=' . $tax->name ) ) . '" target="_blank">' . ( empty( $tax->labels->name ) ? __( 'Categories' ) : $tax->labels->name ) . '</a>'
         );
-        unset($tax);
+        unset( $tax );
 
         return $link;
     }
@@ -606,8 +606,8 @@ 
 			$hide_opt = rtrim( $hide_opt );
 		}
 
-        if ( is_array($observed_value) ) {
-            return self::array_value_condition($observed_value, $cond, $hide_opt);
+        if ( is_array( $observed_value ) ) {
+            return self::array_value_condition( $observed_value, $cond, $hide_opt );
         }
 
         $m = false;
@@ -620,7 +620,7 @@ 
         } else if ( $cond == '<' ) {
             $m = $observed_value < $hide_opt;
         } else if ( $cond == 'LIKE' || $cond == 'not LIKE' ) {
-            $m = stripos($observed_value, $hide_opt);
+            $m = stripos( $observed_value, $hide_opt );
             if ( $cond == 'not LIKE' ) {
                 $m = ( $m === false ) ? true : false;
             } else {
@@ -633,23 +633,23 @@ 
 	public static function array_value_condition( $observed_value, $cond, $hide_opt ) {
         $m = false;
         if ( $cond == '==' ) {
-            if ( is_array($hide_opt) ) {
-                $m = array_intersect($hide_opt, $observed_value);
-                $m = empty($m) ? false : true;
+            if ( is_array( $hide_opt ) ) {
+                $m = array_intersect( $hide_opt, $observed_value );
+                $m = empty( $m ) ? false : true;
             } else {
-                $m = in_array($hide_opt, $observed_value);
+                $m = in_array( $hide_opt, $observed_value );
             }
         } else if ( $cond == '!=' ) {
-            $m = ! in_array($hide_opt, $observed_value);
+            $m = ! in_array( $hide_opt, $observed_value );
         } else if ( $cond == '>' ) {
-            $min = min($observed_value);
+            $min = min( $observed_value );
             $m = $min > $hide_opt;
         } else if ( $cond == '<' ) {
-            $max = max($observed_value);
+            $max = max( $observed_value );
             $m = $max < $hide_opt;
         } else if ( $cond == 'LIKE' || $cond == 'not LIKE' ) {
             foreach ( $observed_value as $ob ) {
-                $m = strpos($ob, $hide_opt);
+                $m = strpos( $ob, $hide_opt );
                 if ( $m !== false ) {
                     $m = true;
                     break;
@@ -670,27 +670,27 @@ 
      * @return string
      */
 	public static function basic_replace_shortcodes( $value, $form, $entry ) {
-        if ( strpos($value, '[sitename]') !== false ) {
+        if ( strpos( $value, '[sitename]' ) !== false ) {
             $new_value = wp_specialchars_decode( FrmAppHelper::site_name(), ENT_QUOTES );
-            $value = str_replace('[sitename]', $new_value, $value);
+            $value = str_replace( '[sitename]', $new_value, $value );
         }
 
-        $value = apply_filters('frm_content', $value, $form, $entry);
-        $value = do_shortcode($value);
+        $value = apply_filters( 'frm_content', $value, $form, $entry );
+        $value = do_shortcode( $value );
 
         return $value;
     }
 
 	public static function get_shortcodes( $content, $form_id ) {
         if ( FrmAppHelper::pro_is_installed() ) {
-            return FrmProDisplaysHelper::get_shortcodes($content, $form_id);
+            return FrmProDisplaysHelper::get_shortcodes( $content, $form_id );
         }
 
         $fields = FrmField::getAll( array( 'fi.form_id' => (int) $form_id, 'fi.type not' => FrmField::no_save_fields() ) );
 
-        $tagregexp = self::allowed_shortcodes($fields);
+        $tagregexp = self::allowed_shortcodes( $fields );
 
-        preg_match_all("/\[(if )?($tagregexp)\b(.*?)(?:(\/))?\](?:(.+?)\[\/\2\])?/s", $content, $matches, PREG_PATTERN_ORDER);
+        preg_match_all( "/\[(if )?($tagregexp)\b(.*?)(?:(\/))?\](?:(.+?)\[\/\2\])?/s", $content, $matches, PREG_PATTERN_ORDER );
 
         return $matches;
     }
@@ -708,7 +708,7 @@ 
             $tagregexp[] = $field->field_key;
         }
 
-        $tagregexp = implode('|', $tagregexp);
+        $tagregexp = implode( '|', $tagregexp );
         return $tagregexp;
     }
 
@@ -720,28 +720,28 @@ 
         );
 
         foreach ( $shortcodes[0] as $short_key => $tag ) {
-            $atts = shortcode_parse_atts( $shortcodes[3][ $short_key ] );
+            $atts = shortcode_parse_atts( $shortcodes[3][$short_key] );
 
-            if ( ! empty( $shortcodes[3][ $short_key ] ) ) {
-				$tag = str_replace( array( '[', ']' ), '', $shortcodes[0][ $short_key ] );
-                $tags = explode(' ', $tag);
-                if ( is_array($tags) ) {
+            if ( ! empty( $shortcodes[3][$short_key] ) ) {
+				$tag = str_replace( array( '[', ']' ), '', $shortcodes[0][$short_key] );
+                $tags = explode( ' ', $tag );
+                if ( is_array( $tags ) ) {
                     $tag = $tags[0];
                 }
             } else {
-                $tag = $shortcodes[2][ $short_key ];
+                $tag = $shortcodes[2][$short_key];
             }
 
             switch ( $tag ) {
                 case 'id':
                 case 'key':
                 case 'ip':
-                    $replace_with = $shortcode_values[ $tag ];
+                    $replace_with = $shortcode_values[$tag];
                 break;
 
                 case 'user_agent':
                 case 'user-agent':
-                    $entry->description = maybe_unserialize($entry->description);
+                    $entry->description = maybe_unserialize( $entry->description );
 					$replace_with = FrmEntryFormat::get_browser( $entry->description['browser'] );
                 break;
 
@@ -749,25 +749,25 @@ 
                 case 'created-at':
                 case 'updated_at':
                 case 'updated-at':
-                    if ( isset($atts['format']) ) {
+                    if ( isset( $atts['format'] ) ) {
                         $time_format = ' ';
                     } else {
-                        $atts['format'] = get_option('date_format');
+                        $atts['format'] = get_option( 'date_format' );
                         $time_format = '';
                     }
 
-                    $this_tag = str_replace('-', '_', $tag);
-                    $replace_with = FrmAppHelper::get_formatted_time($entry->{$this_tag}, $atts['format'], $time_format);
-                    unset($this_tag);
+                    $this_tag = str_replace( '-', '_', $tag );
+                    $replace_with = FrmAppHelper::get_formatted_time( $entry->{$this_tag}, $atts['format'], $time_format );
+                    unset( $this_tag );
                 break;
 
                 case 'created_by':
                 case 'created-by':
                 case 'updated_by':
                 case 'updated-by':
-                    $this_tag = str_replace('-', '_', $tag);
+                    $this_tag = str_replace( '-', '_', $tag );
 					$replace_with = self::get_display_value( $entry->{$this_tag}, (object) array( 'type' => 'user_id' ), $atts );
-                    unset($this_tag);
+                    unset( $this_tag );
                 break;
 
                 case 'admin_email':
@@ -784,16 +784,16 @@ 
                         break;
                     }
 
-                    $sep = isset($atts['sep']) ? $atts['sep'] : ', ';
+                    $sep = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
 
                     $replace_with = FrmEntryMeta::get_meta_value( $entry, $field->id );
 
                     $atts['entry_id'] = $entry->id;
                     $atts['entry_key'] = $entry->item_key;
 
-                    if ( isset($atts['show']) && $atts['show'] == 'field_label' ) {
+                    if ( isset( $atts['show'] ) && $atts['show'] == 'field_label' ) {
                         $replace_with = $field->name;
-                    } else if ( isset($atts['show']) && $atts['show'] == 'description' ) {
+                    } else if ( isset( $atts['show'] ) && $atts['show'] == 'description' ) {
                         $replace_with = $field->description;
 					} else {
 						$string_value = $replace_with;
@@ -808,15 +808,15 @@ 
 						}
 					}
 
-                    unset($field);
+                    unset( $field );
                 break;
             }
 
-            if ( isset($replace_with) ) {
-                $content = str_replace( $shortcodes[0][ $short_key ], $replace_with, $content );
+            if ( isset( $replace_with ) ) {
+                $content = str_replace( $shortcodes[0][$short_key], $replace_with, $content );
             }
 
-            unset($atts, $conditional, $replace_with);
+            unset( $atts, $conditional, $replace_with );
 		}
 
 		return $content;
@@ -832,7 +832,7 @@ 
         $new_value = '';
         switch ( $tag ) {
             case 'admin_email':
-                $new_value = get_option('admin_email');
+                $new_value = get_option( 'admin_email' );
                 break;
             case 'siteurl':
                 $new_value = FrmAppHelper::site_url();
@@ -858,28 +858,28 @@ 
      * @return string|array
      */
     public static function process_get_shortcode( $atts, $return_array = false ) {
-        if ( ! isset($atts['param']) ) {
+        if ( ! isset( $atts['param'] ) ) {
             return '';
         }
 
-        if ( strpos($atts['param'], '&#91;') ) {
-            $atts['param'] = str_replace('&#91;', '[', $atts['param']);
-            $atts['param'] = str_replace('&#93;', ']', $atts['param']);
+        if ( strpos( $atts['param'], '&#91;' ) ) {
+            $atts['param'] = str_replace( '&#91;', '[', $atts['param'] );
+            $atts['param'] = str_replace( '&#93;', ']', $atts['param'] );
         }
 
-        $new_value = FrmAppHelper::get_param($atts['param'], '');
+        $new_value = FrmAppHelper::get_param( $atts['param'], '' );
         $new_value = FrmAppHelper::get_query_var( $new_value, $atts['param'] );
 
         if ( $new_value == '' ) {
-            if ( ! isset($atts['prev_val']) ) {
+            if ( ! isset( $atts['prev_val'] ) ) {
                 $atts['prev_val'] = '';
             }
 
-            $new_value = isset($atts['default']) ? $atts['default'] : $atts['prev_val'];
+            $new_value = isset( $atts['default'] ) ? $atts['default'] : $atts['prev_val'];
         }
 
-        if ( is_array($new_value) && ! $return_array ) {
-            $new_value = implode(', ', $new_value);
+        if ( is_array( $new_value ) && ! $return_array ) {
+            $new_value = implode( ', ', $new_value );
         }
 
         return $new_value;
@@ -892,12 +892,12 @@ 
 		$replace_with = apply_filters( 'frm_get_display_value', $replace_with, $field, $atts );
 
         if ( $field->type == 'textarea' || $field->type == 'rte' ) {
-            $autop = isset($atts['wpautop']) ? $atts['wpautop'] : true;
-            if ( apply_filters('frm_use_wpautop', $autop) ) {
-                if ( is_array($replace_with) ) {
-                    $replace_with = implode("\n", $replace_with);
+            $autop = isset( $atts['wpautop'] ) ? $atts['wpautop'] : true;
+            if ( apply_filters( 'frm_use_wpautop', $autop ) ) {
+                if ( is_array( $replace_with ) ) {
+                    $replace_with = implode( "\n", $replace_with );
                 }
-                $replace_with = wpautop($replace_with);
+                $replace_with = wpautop( $replace_with );
             }
 			unset( $autop );
 		} else if ( is_array( $replace_with ) ) {
@@ -919,14 +919,14 @@ 
 		$field_selection = array_merge( FrmField::pro_field_selection(), FrmField::field_selection() );
 
         $field_types = array();
-        if ( in_array($type, $single_input) ) {
+        if ( in_array( $type, $single_input ) ) {
             self::field_types_for_input( $single_input, $field_selection, $field_types );
-        } else if ( in_array($type, $multiple_input) ) {
+        } else if ( in_array( $type, $multiple_input ) ) {
             self::field_types_for_input( $multiple_input, $field_selection, $field_types );
-        } else if ( in_array($type, $other_type) ) {
+        } else if ( in_array( $type, $other_type ) ) {
             self::field_types_for_input( $other_type, $field_selection, $field_types );
-		} else if ( isset( $field_selection[ $type ] ) ) {
-            $field_types[ $type ] = $field_selection[ $type ];
+		} else if ( isset( $field_selection[$type] ) ) {
+            $field_types[$type] = $field_selection[$type];
         }
 
         return $field_types;
@@ -934,8 +934,8 @@ 
 
     private static function field_types_for_input( $inputs, $fields, &$field_types ) {
         foreach ( $inputs as $input ) {
-            $field_types[ $input ] = $fields[ $input ];
-            unset($input);
+            $field_types[$input] = $fields[$input];
+            unset( $input );
         }
     }
 
@@ -980,21 +980,21 @@ 
 		// Check posted vals before checking saved values
 
 		// For fields inside repeating sections - note, don't check if $pointer is true because it will often be zero
-		if ( $parent && isset( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ] ) ) {
+		if ( $parent && isset( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']] ) ) {
 			if ( FrmField::is_field_with_multiple_values( $field ) ) {
-				$other_val = isset( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ][ $opt_key ] ) ? sanitize_text_field( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ][ $opt_key ] ) : '';
+				$other_val = isset( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']][$opt_key] ) ? sanitize_text_field( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']][$opt_key] ) : '';
 			} else {
-				$other_val = sanitize_text_field( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ] );
+				$other_val = sanitize_text_field( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']] );
 			}
 			return $other_val;
 
-		} else if ( isset( $field['id'] ) && isset( $_POST['item_meta']['other'][ $field['id'] ] ) ) {
+		} else if ( isset( $field['id'] ) && isset( $_POST['item_meta']['other'][$field['id']] ) ) {
 			// For normal fields
 
 			if ( FrmField::is_field_with_multiple_values( $field ) ) {
-				$other_val = isset( $_POST['item_meta']['other'][ $field['id'] ][ $opt_key ] ) ? sanitize_text_field( $_POST['item_meta']['other'][ $field['id'] ][ $opt_key ] ) : '';
+				$other_val = isset( $_POST['item_meta']['other'][$field['id']][$opt_key] ) ? sanitize_text_field( $_POST['item_meta']['other'][$field['id']][$opt_key] ) : '';
 			} else {
-				$other_val = sanitize_text_field( $_POST['item_meta']['other'][ $field['id'] ] );
+				$other_val = sanitize_text_field( $_POST['item_meta']['other'][$field['id']] );
 			}
 			return $other_val;
 		}
@@ -1003,8 +1003,8 @@ 
 		if ( $field['type'] == 'checkbox' && is_array( $field['value'] ) ) {
 			// Check if there is an "other" val in saved value and make sure the
 			// "other" val is not equal to the Other checkbox option
-			if ( isset( $field['value'][ $opt_key ] ) && $field['options'][ $opt_key ] != $field['value'][ $opt_key ] ) {
-				$other_val = $field['value'][ $opt_key ];
+			if ( isset( $field['value'][$opt_key] ) && $field['options'][$opt_key] != $field['value'][$opt_key] ) {
+				$other_val = $field['value'][$opt_key];
 			}
 		} else {
 			/**
@@ -1016,8 +1016,8 @@ 
 				// Multi-select dropdowns - key is not preserved
 				if ( is_array( $field['value'] ) ) {
 					$o_key = array_search( $temp_val, $field['value'] );
-					if ( isset( $field['value'][ $o_key ] ) ) {
-						unset( $field['value'][ $o_key ], $o_key );
+					if ( isset( $field['value'][$o_key] ) ) {
+						unset( $field['value'][$o_key], $o_key );
 					}
 				} else if ( $temp_val == $field['value'] ) {
 					// For radio and regular dropdowns
@@ -1074,7 +1074,7 @@ 
 	private static function set_other_name( $args, &$other_args ) {
 		//Set up name for other field
 		$other_args['name'] = str_replace( '[]', '', $args['field_name'] );
-		$other_args['name'] = preg_replace('/\[' . $args['field']['id'] . '\]$/', '', $other_args['name']);
+		$other_args['name'] = preg_replace( '/\[' . $args['field']['id'] . '\]$/', '', $other_args['name'] );
 		$other_args['name'] = $other_args['name'] . '[other]' . '[' . $args['field']['id'] . ']';
 
 		//Converts item_meta[field_id] => item_meta[other][field_id] and
@@ -1100,7 +1100,7 @@ 
 		// Count should only be greater than 3 if inside of a repeating section
 		if ( count( $temp_array ) > 3 ) {
 			$parent = str_replace( ']', '', $temp_array[1] );
-			$pointer = str_replace( ']', '', $temp_array[2]);
+			$pointer = str_replace( ']', '', $temp_array[2] );
 		}
 
 		// Get text for "other" text field
@@ -1167,11 +1167,11 @@ 
 
 			if ( $display['default_blank'] ) {
 				self::show_default_blank_js( $field['default_blank'] );
-				echo '<input type="hidden" name="field_options[default_blank_'. esc_attr( $field['id'] ) .']" value="' . esc_attr( $field['default_blank'] ) .'" />';
+				echo '<input type="hidden" name="field_options[default_blank_' . esc_attr( $field['id'] ) . ']" value="' . esc_attr( $field['default_blank'] ) . '" />';
 			}
 
 			self::show_onfocus_js( $field['clear_on_focus'] );
-			echo '<input type="hidden" name="field_options[clear_on_focus_'. esc_attr( $field['id'] ) .']" value="' . esc_attr( $field['default_blank'] ) .'" />';
+			echo '<input type="hidden" name="field_options[clear_on_focus_' . esc_attr( $field['id'] ) . ']" value="' . esc_attr( $field['default_blank'] ) . '" />';
 
 			echo '</span>';
 		}
@@ -1205,29 +1205,29 @@ 
         $replace = array();
         $replace_with = array();
         foreach ( (array) $frm_duplicate_ids as $old => $new ) {
-            $replace[] = '[if '. $old .']';
-            $replace_with[] = '[if '. $new .']';
-            $replace[] = '[if '. $old .' ';
-            $replace_with[] = '[if '. $new .' ';
-            $replace[] = '[/if '. $old .']';
-            $replace_with[] = '[/if '. $new .']';
-            $replace[] = '[foreach '. $old .']';
-            $replace_with[] = '[foreach '. $new .']';
-            $replace[] = '[/foreach '. $old .']';
-            $replace_with[] = '[/foreach '. $new .']';
-            $replace[] = '['. $old .']';
-            $replace_with[] = '['. $new .']';
-            $replace[] = '['. $old .' ';
-            $replace_with[] = '['. $new .' ';
-            unset($old, $new);
+            $replace[] = '[if ' . $old . ']';
+            $replace_with[] = '[if ' . $new . ']';
+            $replace[] = '[if ' . $old . ' ';
+            $replace_with[] = '[if ' . $new . ' ';
+            $replace[] = '[/if ' . $old . ']';
+            $replace_with[] = '[/if ' . $new . ']';
+            $replace[] = '[foreach ' . $old . ']';
+            $replace_with[] = '[foreach ' . $new . ']';
+            $replace[] = '[/foreach ' . $old . ']';
+            $replace_with[] = '[/foreach ' . $new . ']';
+            $replace[] = '[' . $old . ']';
+            $replace_with[] = '[' . $new . ']';
+            $replace[] = '[' . $old . ' ';
+            $replace_with[] = '[' . $new . ' ';
+            unset( $old, $new );
         }
 		if ( is_array( $val ) ) {
 			foreach ( $val as $k => $v ) {
-                $val[ $k ] = str_replace( $replace, $replace_with, $v );
-                unset($k, $v);
+                $val[$k] = str_replace( $replace, $replace_with, $v );
+                unset( $k, $v );
             }
         } else {
-            $val = str_replace($replace, $replace_with, $val);
+            $val = str_replace( $replace, $replace_with, $val );
         }
 
         return $val;
@@ -1240,7 +1240,7 @@ 
             'DC' => 'District of Columbia',
             'FL' => 'Florida', 'GA' => 'Georgia', 'HI' => 'Hawaii', 'ID' => 'Idaho',
             'IL' => 'Illinois', 'IN' => 'Indiana', 'IA' => 'Iowa', 'KS' => 'Kansas',
-            'KY' => 'Kentucky', 'LA' => 'Louisiana', 'ME' => 'Maine','MD' => 'Maryland',
+            'KY' => 'Kentucky', 'LA' => 'Louisiana', 'ME' => 'Maine', 'MD' => 'Maryland',
             'MA' => 'Massachusetts', 'MI' => 'Michigan', 'MN' => 'Minnesota', 'MS' => 'Mississippi',
             'MO' => 'Missouri', 'MT' => 'Montana', 'NE' => 'Nebraska', 'NV' => 'Nevada',
             'NH' => 'New Hampshire', 'NJ' => 'New Jersey', 'NM' => 'New Mexico', 'NY' => 'New York',
@@ -1331,35 +1331,35 @@ 
     }
 
 	public static function get_bulk_prefilled_opts( array &$prepop ) {
-		$prepop[ __( 'Countries', 'formidable' ) ] = FrmFieldsHelper::get_countries();
+		$prepop[__( 'Countries', 'formidable' )] = FrmFieldsHelper::get_countries();
 
         $states = FrmFieldsHelper::get_us_states();
-        $state_abv = array_keys($states);
-        sort($state_abv);
-		$prepop[ __( 'U.S. State Abbreviations', 'formidable' ) ] = $state_abv;
+        $state_abv = array_keys( $states );
+        sort( $state_abv );
+		$prepop[__( 'U.S. State Abbreviations', 'formidable' )] = $state_abv;
 
-        $states = array_values($states);
-        sort($states);
-		$prepop[ __( 'U.S. States', 'formidable' ) ] = $states;
-        unset($state_abv, $states);
+        $states = array_values( $states );
+        sort( $states );
+		$prepop[__( 'U.S. States', 'formidable' )] = $states;
+        unset( $state_abv, $states );
 
-		$prepop[ __( 'Age', 'formidable' ) ] = array(
+		$prepop[__( 'Age', 'formidable' )] = array(
             __( 'Under 18', 'formidable' ), __( '18-24', 'formidable' ), __( '25-34', 'formidable' ),
             __( '35-44', 'formidable' ), __( '45-54', 'formidable' ), __( '55-64', 'formidable' ),
             __( '65 or Above', 'formidable' ), __( 'Prefer Not to Answer', 'formidable' ),
         );
 
-		$prepop[ __( 'Satisfaction', 'formidable' ) ] = array(
+		$prepop[__( 'Satisfaction', 'formidable' )] = array(
             __( 'Very Satisfied', 'formidable' ), __( 'Satisfied', 'formidable' ), __( 'Neutral', 'formidable' ),
             __( 'Unsatisfied', 'formidable' ), __( 'Very Unsatisfied', 'formidable' ), __( 'N/A', 'formidable' ),
         );
 
-		$prepop[ __( 'Importance', 'formidable' ) ] = array(
+		$prepop[__( 'Importance', 'formidable' )] = array(
             __( 'Very Important', 'formidable' ), __( 'Important', 'formidable' ), __( 'Neutral', 'formidable' ),
             __( 'Somewhat Important', 'formidable' ), __( 'Not at all Important', 'formidable' ), __( 'N/A', 'formidable' ),
         );
 
-		$prepop[ __( 'Agreement', 'formidable' ) ] = array(
+		$prepop[__( 'Agreement', 'formidable' )] = array(
             __( 'Strongly Agree', 'formidable' ), __( 'Agree', 'formidable' ), __( 'Neutral', 'formidable' ),
             __( 'Disagree', 'formidable' ), __( 'Strongly Disagree', 'formidable' ), __( 'N/A', 'formidable' ),
         );

classes/controllers/FrmEntriesController.php

Indentation +335 added lines, -335 removed lines

@@ -2,201 +2,201 @@ 
 
 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( 'http://formidablepro.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( 'http://formidablepro.com/help-desk/' ) ) . '" target="_blank">' . esc_html__( 'Support', 'formidable' ) . '</a></p>'
-    	);
+		);
 
-        return $help;
-    }
+		return $help;
+	}
 
 	public static function manage_columns( $columns ) {
-        global $frm_vars, $wpdb;
+		global $frm_vars, $wpdb;
 		$form_id = FrmForm::get_current_form_id();
 
 		$columns[ $form_id . '_id' ] = 'ID';
 		$columns[ $form_id . '_item_key' ] = esc_html__( 'Entry Key', 'formidable' );
 
-        if ( ! $form_id ) {
-            return $columns;
-        }
+		if ( ! $form_id ) {
+			return $columns;
+		}
 
-        $form_cols = FrmField::get_all_for_form($form_id, '', 'include');
+		$form_cols = FrmField::get_all_for_form($form_id, '', 'include');
 
-        foreach ( $form_cols as $form_col ) {
+		foreach ( $form_cols as $form_col ) {
 			if ( FrmField::is_no_save_field( $form_col->type ) ) {
-                continue;
-            }
+				continue;
+			}
 
-            if ( $form_col->type == 'form' && isset( $form_col->field_options['form_select'] ) && ! empty( $form_col->field_options['form_select'] ) ) {
+			if ( $form_col->type == 'form' && isset( $form_col->field_options['form_select'] ) && ! empty( $form_col->field_options['form_select'] ) ) {
 				$sub_form_cols = FrmField::get_all_for_form( $form_col->field_options['form_select'] );
 
-                if ( $sub_form_cols ) {
-                    foreach ( $sub_form_cols as $k => $sub_form_col ) {
+				if ( $sub_form_cols ) {
+					foreach ( $sub_form_cols as $k => $sub_form_col ) {
 						if ( FrmField::is_no_save_field( $sub_form_col->type ) ) {
-                            unset( $sub_form_cols[ $k ] );
-                            continue;
-                        }
+							unset( $sub_form_cols[ $k ] );
+							continue;
+						}
 						$columns[ $form_id . '_' . $sub_form_col->field_key . '-_-' . $form_col->id ] = FrmAppHelper::truncate( $sub_form_col->name, 35 );
-                        unset($sub_form_col);
-                    }
-                }
-                unset($sub_form_cols);
-            } else {
-                $col_id = $form_col->field_key;
-                if ( $form_col->form_id != $form_id ) {
+						unset($sub_form_col);
+					}
+				}
+				unset($sub_form_cols);
+			} else {
+				$col_id = $form_col->field_key;
+				if ( $form_col->form_id != $form_id ) {
 					$col_id .= '-_-form' . $form_col->form_id;
-                }
+				}
 
-                if ( isset($form_col->field_options['separate_value']) && $form_col->field_options['separate_value'] ) {
+				if ( isset($form_col->field_options['separate_value']) && $form_col->field_options['separate_value'] ) {
 					$columns[ $form_id . '_frmsep_' . $col_id ] = FrmAppHelper::truncate( $form_col->name, 35 );
-                }
+				}
 				$columns[ $form_id . '_' . $col_id ] = FrmAppHelper::truncate( $form_col->name, 35 );
-            }
-        }
+			}
+		}
 
 		$columns[ $form_id . '_created_at' ] = __( 'Entry creation date', 'formidable' );
 		$columns[ $form_id . '_updated_at' ] = __( 'Entry update date', 'formidable' );
 		$columns[ $form_id . '_ip' ] = 'IP';
 
-        $frm_vars['cols'] = $columns;
+		$frm_vars['cols'] = $columns;
 
 		$action = FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' );
 		if ( FrmAppHelper::is_admin_page( 'formidable-entries' ) && in_array( $action, array( '', 'list', 'destroy' ) ) ) {
 			add_screen_option( 'per_page', array( 'label' => __( 'Entries', 'formidable' ), 'default' => 20, 'option' => 'formidable_page_formidable_entries_per_page' ) );
-        }
+		}
 
-        return $columns;
-    }
+		return $columns;
+	}
 
 	public static function check_hidden_cols( $check, $object_id, $meta_key, $meta_value, $prev_value ) {
 		$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();
@@ -222,226 +222,226 @@ 
 	}
 
 	public static function hidden_columns( $result ) {
-        global $frm_vars;
+		global $frm_vars;
 
 		$form_id = FrmForm::get_current_form_id();
 
-        $return = false;
-        foreach ( (array) $result as $r ) {
-            if ( ! empty( $r ) ) {
-                $form_prefix = explode( '_', $r );
-                $form_prefix = $form_prefix[0];
+		$return = false;
+		foreach ( (array) $result as $r ) {
+			if ( ! empty( $r ) ) {
+				$form_prefix = explode( '_', $r );
+				$form_prefix = $form_prefix[0];
 
-                if ( (int) $form_prefix == (int) $form_id ) {
-                    $return = true;
-                    break;
-                }
+				if ( (int) $form_prefix == (int) $form_id ) {
+					$return = true;
+					break;
+				}
 
-                unset($form_prefix);
-            }
-        }
+				unset($form_prefix);
+			}
+		}
 
-        if ( $return ) {
+		if ( $return ) {
 			return $result;
 		}
 
-        $i = isset($frm_vars['cols']) ? count($frm_vars['cols']) : 0;
-        $max_columns = 8;
-        if ( $i <= $max_columns ) {
+		$i = isset($frm_vars['cols']) ? count($frm_vars['cols']) : 0;
+		$max_columns = 8;
+		if ( $i <= $max_columns ) {
 			return $result;
 		}
 
-        global $frm_vars;
-        if ( isset($frm_vars['current_form']) && $frm_vars['current_form'] ) {
-            $frm_vars['current_form']->options = maybe_unserialize($frm_vars['current_form']->options);
-        }
+		global $frm_vars;
+		if ( isset($frm_vars['current_form']) && $frm_vars['current_form'] ) {
+			$frm_vars['current_form']->options = maybe_unserialize($frm_vars['current_form']->options);
+		}
 
-        if ( isset($frm_vars['current_form']) && $frm_vars['current_form'] && isset($frm_vars['current_form']->options['hidden_cols']) && ! empty($frm_vars['current_form']->options['hidden_cols']) ) {
-            $result = $frm_vars['current_form']->options['hidden_cols'];
-        } else {
-            $cols = $frm_vars['cols'];
-            $cols = array_reverse($cols, true);
+		if ( isset($frm_vars['current_form']) && $frm_vars['current_form'] && isset($frm_vars['current_form']->options['hidden_cols']) && ! empty($frm_vars['current_form']->options['hidden_cols']) ) {
+			$result = $frm_vars['current_form']->options['hidden_cols'];
+		} else {
+			$cols = $frm_vars['cols'];
+			$cols = array_reverse($cols, true);
 
 			$result[] = $form_id . '_id';
-            $i--;
+			$i--;
 
 			$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::get_current_form();
 		$params = FrmForm::get_admin_params( $form );
 
-        if ( $form ) {
-            $params['form'] = $form->id;
-            $frm_vars['current_form'] = $form;
+		if ( $form ) {
+			$params['form'] = $form->id;
+			$frm_vars['current_form'] = $form;
 
-	        if ( 'trash' == $form->status ) {
-	            $delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
-	            $time_to_delete = FrmAppHelper::human_time_diff( $delete_timestamp, ( isset( $form->options['trash_time'] ) ? ( $form->options['trash_time'] ) : time() ) );
-	            $errors['trash'] = sprintf( __( 'This form is in the trash and is scheduled to be deleted permanently in %s along with any entries.', 'formidable' ), $time_to_delete );
-	            unset( $time_to_delete, $delete_timestamp );
-	        }
+			if ( 'trash' == $form->status ) {
+				$delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
+				$time_to_delete = FrmAppHelper::human_time_diff( $delete_timestamp, ( isset( $form->options['trash_time'] ) ? ( $form->options['trash_time'] ) : time() ) );
+				$errors['trash'] = sprintf( __( 'This form is in the trash and is scheduled to be deleted permanently in %s along with any entries.', 'formidable' ), $time_to_delete );
+				unset( $time_to_delete, $delete_timestamp );
+			}
 		}
 
-        $table_class = apply_filters( 'frm_entries_list_class', 'FrmEntriesListHelper' );
+		$table_class = apply_filters( 'frm_entries_list_class', 'FrmEntriesListHelper' );
 
-        $wp_list_table = new $table_class( array( 'params' => $params ) );
+		$wp_list_table = new $table_class( array( 'params' => $params ) );
 
-        $pagenum = $wp_list_table->get_pagenum();
+		$pagenum = $wp_list_table->get_pagenum();
 
-        $wp_list_table->prepare_items();
+		$wp_list_table->prepare_items();
 
-        $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-        if ( $pagenum > $total_pages && $total_pages > 0 ) {
+		$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
+		if ( $pagenum > $total_pages && $total_pages > 0 ) {
 			$url = add_query_arg( 'paged', $total_pages );
-            if ( headers_sent() ) {
-                echo FrmAppHelper::js_redirect($url);
-            } else {
-                wp_redirect( esc_url_raw( $url ) );
-            }
-            die();
-        }
-
-        if ( empty($message) && isset($_GET['import-message']) ) {
-            $message = __( 'Your import is complete', 'formidable' );
-        }
+			if ( headers_sent() ) {
+				echo FrmAppHelper::js_redirect($url);
+			} else {
+				wp_redirect( esc_url_raw( $url ) );
+			}
+			die();
+		}
+
+		if ( empty($message) && isset($_GET['import-message']) ) {
+			$message = __( 'Your import is complete', 'formidable' );
+		}
 
 		require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/list.php' );
-    }
+	}
 
-    /* Back End CRUD */
+	/* Back End CRUD */
 	public static function show( $id = 0 ) {
-        FrmAppHelper::permission_check('frm_view_entries');
+		FrmAppHelper::permission_check('frm_view_entries');
 
-        if ( ! $id ) {
+		if ( ! $id ) {
 			$id = FrmAppHelper::get_param( 'id', 0, 'get', 'absint' );
 
-            if ( ! $id ) {
+			if ( ! $id ) {
 				$id = FrmAppHelper::get_param( 'item_id', 0, 'get', 'absint' );
-            }
-        }
+			}
+		}
 
-        $entry = FrmEntry::getOne($id, true);
+		$entry = FrmEntry::getOne($id, true);
 
-        $data = maybe_unserialize($entry->description);
+		$data = maybe_unserialize($entry->description);
 		if ( ! is_array( $data ) || ! isset( $data['referrer'] ) ) {
 			$data = array( 'referrer' => $data );
 		}
 
 		$fields = FrmField::get_all_for_form( $entry->form_id, '', 'include' );
-        $to_emails = array();
+		$to_emails = array();
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/show.php' );
-    }
+	}
 
-    public static function destroy() {
-        FrmAppHelper::permission_check('frm_delete_entries');
+	public static function destroy() {
+		FrmAppHelper::permission_check('frm_delete_entries');
 
 		$params = FrmForm::get_admin_params();
 
-        if ( isset($params['keep_post']) && $params['keep_post'] ) {
-            //unlink entry from post
-            global $wpdb;
+		if ( isset($params['keep_post']) && $params['keep_post'] ) {
+			//unlink entry from post
+			global $wpdb;
 			$wpdb->update( $wpdb->prefix .'frm_items', array( 'post_id' => '' ), array( 'id' => $params['id'] ) );
-        }
+		}
 
-        $message = '';
-        if ( FrmEntry::destroy( $params['id'] ) ) {
-            $message = __( 'Entry was Successfully Destroyed', 'formidable' );
-        }
+		$message = '';
+		if ( FrmEntry::destroy( $params['id'] ) ) {
+			$message = __( 'Entry was Successfully Destroyed', 'formidable' );
+		}
 
-        self::display_list( $message );
-    }
+		self::display_list( $message );
+	}
 
-    public static function destroy_all() {
-        if ( ! current_user_can( 'frm_delete_entries' ) ) {
-            $frm_settings = FrmAppHelper::get_settings();
-            wp_die( $frm_settings->admin_permission );
-        }
+	public static function destroy_all() {
+		if ( ! current_user_can( 'frm_delete_entries' ) ) {
+			$frm_settings = FrmAppHelper::get_settings();
+			wp_die( $frm_settings->admin_permission );
+		}
 
-        global $wpdb;
+		global $wpdb;
 		$params = FrmForm::get_admin_params();
-        $message = '';
-        $errors = array();
-        $form_id = (int) $params['form'];
+		$message = '';
+		$errors = array();
+		$form_id = (int) $params['form'];
 
-        if ( $form_id ) {
-            $entry_ids = FrmDb::get_col( 'frm_items', array( 'form_id' => $form_id ) );
+		if ( $form_id ) {
+			$entry_ids = FrmDb::get_col( 'frm_items', array( 'form_id' => $form_id ) );
 			$action = FrmFormAction::get_action_for_form( $form_id, 'wppost', 1 );
 
-            if ( $action ) {
-                // this action takes a while, so only trigger it if there are posts to delete
-                foreach ( $entry_ids as $entry_id ) {
-                    do_action( 'frm_before_destroy_entry', $entry_id );
-                    unset( $entry_id );
-                }
-            }
-
-            $wpdb->query( $wpdb->prepare( "DELETE em.* FROM {$wpdb->prefix}frm_item_metas as em INNER JOIN {$wpdb->prefix}frm_items as e on (em.item_id=e.id) and form_id=%d", $form_id ) );
-            $results = $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}frm_items WHERE form_id=%d", $form_id ) );
-            if ( $results ) {
-                $message = __( 'Entries were Successfully Destroyed', 'formidable' );
-            }
-        } else {
-            $errors = __( 'No entries were specified', 'formidable' );
-        }
-
-        self::display_list( $message, $errors );
-    }
-
-    public static function show_form( $id = '', $key = '', $title = false, $description = false ) {
-        _deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::show_form()' );
-        return FrmFormsController::show_form( $id, $key, $title, $description );
-    }
-
-    public static function get_form( $filename, $form, $title, $description ) {
-        _deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::get_form()' );
-        return FrmFormsController::get_form( $form, $title, $description );
-    }
-
-    public static function process_entry( $errors = '', $ajax = false ) {
+			if ( $action ) {
+				// this action takes a while, so only trigger it if there are posts to delete
+				foreach ( $entry_ids as $entry_id ) {
+					do_action( 'frm_before_destroy_entry', $entry_id );
+					unset( $entry_id );
+				}
+			}
+
+			$wpdb->query( $wpdb->prepare( "DELETE em.* FROM {$wpdb->prefix}frm_item_metas as em INNER JOIN {$wpdb->prefix}frm_items as e on (em.item_id=e.id) and form_id=%d", $form_id ) );
+			$results = $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}frm_items WHERE form_id=%d", $form_id ) );
+			if ( $results ) {
+				$message = __( 'Entries were Successfully Destroyed', 'formidable' );
+			}
+		} else {
+			$errors = __( 'No entries were specified', 'formidable' );
+		}
+
+		self::display_list( $message, $errors );
+	}
+
+	public static function show_form( $id = '', $key = '', $title = false, $description = false ) {
+		_deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::show_form()' );
+		return FrmFormsController::show_form( $id, $key, $title, $description );
+	}
+
+	public static function get_form( $filename, $form, $title, $description ) {
+		_deprecated_function( __FUNCTION__, '1.07.05', 'FrmFormsController::get_form()' );
+		return FrmFormsController::get_form( $form, $title, $description );
+	}
+
+	public static function process_entry( $errors = '', $ajax = false ) {
 		$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
 		if ( FrmAppHelper::is_admin() || empty( $_POST ) || empty( $form_id ) || ! isset( $_POST['item_key'] ) ) {
-            return;
-        }
+			return;
+		}
 
-        global $frm_vars;
+		global $frm_vars;
 
 		$form = FrmForm::getOne( $form_id );
-        if ( ! $form ) {
-            return;
-        }
+		if ( ! $form ) {
+			return;
+		}
 
 		$params = FrmForm::get_params( $form );
 
-        if ( ! isset( $frm_vars['form_params'] ) ) {
-            $frm_vars['form_params'] = array();
-        }
+		if ( ! isset( $frm_vars['form_params'] ) ) {
+			$frm_vars['form_params'] = array();
+		}
 		$frm_vars['form_params'][ $form->id ] = $params;
 
 		if ( isset( $frm_vars['created_entries'][ $form_id ] ) ) {
-            return;
-        }
+			return;
+		}
 
-        if ( $errors == '' ) {
+		if ( $errors == '' ) {
 			$errors = FrmEntryValidate::validate( $_POST );
-        }
+		}
 
 		/**
 		 * Use this filter to add trigger actions and add errors after
@@ -452,102 +452,102 @@ 
 
 		$frm_vars['created_entries'][ $form_id ] = array( 'errors' => $errors );
 
-        if ( empty( $errors ) ) {
+		if ( empty( $errors ) ) {
 			$_POST['frm_skip_cookie'] = 1;
-            if ( $params['action'] == 'create' ) {
+			if ( $params['action'] == 'create' ) {
 				if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) {
 					$frm_vars['created_entries'][ $form_id ]['entry_id'] = FrmEntry::create( $_POST );
-                }
-            }
+				}
+			}
 
-            do_action( 'frm_process_entry', $params, $errors, $form, array( 'ajax' => $ajax ) );
+			do_action( 'frm_process_entry', $params, $errors, $form, array( 'ajax' => $ajax ) );
 			unset( $_POST['frm_skip_cookie'] );
-        }
-    }
-
-    public static function delete_entry_before_redirect( $url, $form, $atts ) {
-        self::_delete_entry( $atts['id'], $form );
-        return $url;
-    }
-
-    //Delete entry if not redirected
-    public static function delete_entry_after_save( $atts ) {
-        self::_delete_entry( $atts['entry_id'], $atts['form'] );
-    }
-
-    private static function _delete_entry( $entry_id, $form ) {
-        if ( ! $form ) {
-            return;
-        }
-
-        $form->options = maybe_unserialize( $form->options );
-        if ( isset( $form->options['no_save'] ) && $form->options['no_save'] ) {
-            FrmEntry::destroy( $entry_id );
-        }
-    }
+		}
+	}
+
+	public static function delete_entry_before_redirect( $url, $form, $atts ) {
+		self::_delete_entry( $atts['id'], $form );
+		return $url;
+	}
+
+	//Delete entry if not redirected
+	public static function delete_entry_after_save( $atts ) {
+		self::_delete_entry( $atts['entry_id'], $atts['form'] );
+	}
+
+	private static function _delete_entry( $entry_id, $form ) {
+		if ( ! $form ) {
+			return;
+		}
+
+		$form->options = maybe_unserialize( $form->options );
+		if ( isset( $form->options['no_save'] ) && $form->options['no_save'] ) {
+			FrmEntry::destroy( $entry_id );
+		}
+	}
 
 	public static function show_entry_shortcode( $atts ) {
 		return FrmEntryFormat::show_entry( $atts );
 	}
 
-    public static function &filter_email_value( $value, $meta, $entry, $atts = array() ) {
-        $field = FrmField::getOne($meta->field_id);
-        if ( ! $field ) {
-            return $value;
-        }
+	public static function &filter_email_value( $value, $meta, $entry, $atts = array() ) {
+		$field = FrmField::getOne($meta->field_id);
+		if ( ! $field ) {
+			return $value;
+		}
 
-        $value = self::filter_display_value($value, $field, $atts);
-        return $value;
-    }
+		$value = self::filter_display_value($value, $field, $atts);
+		return $value;
+	}
 
 	public static function &filter_shortcode_value( $value, $tag, $atts, $field ) {
-        $plain_text = add_filter('frm_plain_text_email', true);
+		$plain_text = add_filter('frm_plain_text_email', true);
 		FrmEntryFormat::textarea_display_value( $field->type, $plain_text, $value );
 
-        if ( isset($atts['show']) && $atts['show'] == 'value' ) {
-            return $value;
-        }
+		if ( isset($atts['show']) && $atts['show'] == 'value' ) {
+			return $value;
+		}
 
-        return self::filter_display_value($value, $field, $atts);
-    }
+		return self::filter_display_value($value, $field, $atts);
+	}
 
-    public static function &filter_display_value( $value, $field, $atts = array() ) {
-        $saved_value = ( isset($atts['saved_value']) && $atts['saved_value'] ) ? true : false;
+	public static function &filter_display_value( $value, $field, $atts = array() ) {
+		$saved_value = ( isset($atts['saved_value']) && $atts['saved_value'] ) ? true : false;
 		if ( ! in_array( $field->type, array( 'radio', 'checkbox', 'radio', 'select' ) ) || ! FrmField::is_option_true( $field, 'separate_value' ) || $saved_value ) {
-            return $value;
-        }
-
-        $f_values = $f_labels = array();
-
-        foreach ( $field->options as $opt_key => $opt ) {
-            if ( ! is_array($opt) ) {
-                continue;
-            }
-
-            $f_labels[ $opt_key ] = isset( $opt['label'] ) ? $opt['label'] : reset($opt);
-            $f_values[ $opt_key ] = isset( $opt['value'] ) ? $opt['value'] : $f_labels[ $opt_key ];
-            if ( $f_labels[ $opt_key ] == $f_values[ $opt_key ] ) {
-                unset( $f_values[ $opt_key ], $f_labels[ $opt_key ] );
-            }
-            unset($opt_key, $opt);
-        }
-
-        if ( ! empty($f_values) ) {
-            foreach ( (array) $value as $v_key => $val ) {
-                if ( in_array($val, $f_values) ) {
-                    $opt = array_search($val, $f_values);
-                    if ( is_array($value) ) {
-                        $value[ $v_key ] = $f_labels[ $opt ];
-                    } else {
-                        $value = $f_labels[ $opt ];
-                    }
-                }
-                unset($v_key, $val);
-            }
-        }
-
-        return $value;
-    }
+			return $value;
+		}
+
+		$f_values = $f_labels = array();
+
+		foreach ( $field->options as $opt_key => $opt ) {
+			if ( ! is_array($opt) ) {
+				continue;
+			}
+
+			$f_labels[ $opt_key ] = isset( $opt['label'] ) ? $opt['label'] : reset($opt);
+			$f_values[ $opt_key ] = isset( $opt['value'] ) ? $opt['value'] : $f_labels[ $opt_key ];
+			if ( $f_labels[ $opt_key ] == $f_values[ $opt_key ] ) {
+				unset( $f_values[ $opt_key ], $f_labels[ $opt_key ] );
+			}
+			unset($opt_key, $opt);
+		}
+
+		if ( ! empty($f_values) ) {
+			foreach ( (array) $value as $v_key => $val ) {
+				if ( in_array($val, $f_values) ) {
+					$opt = array_search($val, $f_values);
+					if ( is_array($value) ) {
+						$value[ $v_key ] = $f_labels[ $opt ];
+					} else {
+						$value = $f_labels[ $opt ];
+					}
+				}
+				unset($v_key, $val);
+			}
+		}
+
+		return $value;
+	}
 
 	public static function get_params( $form = null ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmForm::get_params' );
@@ -555,13 +555,13 @@ 
 	}
 
 	public static function entry_sidebar( $entry ) {
-        $data = maybe_unserialize($entry->description);
-        $date_format = get_option('date_format');
-        $time_format = get_option('time_format');
+		$data = maybe_unserialize($entry->description);
+		$date_format = get_option('date_format');
+		$time_format = get_option('time_format');
 		if ( isset( $data['browser'] ) ) {
 			$browser = FrmEntryFormat::get_browser( $data['browser'] );
 		}
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/sidebar-shared.php' );
-    }
+	}
 }

Spacing +69 added lines, -69 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,14 +68,14 @@ 
         global $frm_vars, $wpdb;
 		$form_id = FrmForm::get_current_form_id();
 
-		$columns[ $form_id . '_id' ] = 'ID';
-		$columns[ $form_id . '_item_key' ] = esc_html__( 'Entry Key', 'formidable' );
+		$columns[$form_id . '_id'] = 'ID';
+		$columns[$form_id . '_item_key'] = esc_html__( 'Entry Key', 'formidable' );
 
         if ( ! $form_id ) {
             return $columns;
         }
 
-        $form_cols = FrmField::get_all_for_form($form_id, '', 'include');
+        $form_cols = FrmField::get_all_for_form( $form_id, '', 'include' );
 
         foreach ( $form_cols as $form_col ) {
 			if ( FrmField::is_no_save_field( $form_col->type ) ) {
@@ -88,30 +88,30 @@ 
                 if ( $sub_form_cols ) {
                     foreach ( $sub_form_cols as $k => $sub_form_col ) {
 						if ( FrmField::is_no_save_field( $sub_form_col->type ) ) {
-                            unset( $sub_form_cols[ $k ] );
+                            unset( $sub_form_cols[$k] );
                             continue;
                         }
-						$columns[ $form_id . '_' . $sub_form_col->field_key . '-_-' . $form_col->id ] = FrmAppHelper::truncate( $sub_form_col->name, 35 );
-                        unset($sub_form_col);
+						$columns[$form_id . '_' . $sub_form_col->field_key . '-_-' . $form_col->id] = FrmAppHelper::truncate( $sub_form_col->name, 35 );
+                        unset( $sub_form_col );
                     }
                 }
-                unset($sub_form_cols);
+                unset( $sub_form_cols );
             } else {
                 $col_id = $form_col->field_key;
                 if ( $form_col->form_id != $form_id ) {
 					$col_id .= '-_-form' . $form_col->form_id;
                 }
 
-                if ( isset($form_col->field_options['separate_value']) && $form_col->field_options['separate_value'] ) {
-					$columns[ $form_id . '_frmsep_' . $col_id ] = FrmAppHelper::truncate( $form_col->name, 35 );
+                if ( isset( $form_col->field_options['separate_value'] ) && $form_col->field_options['separate_value'] ) {
+					$columns[$form_id . '_frmsep_' . $col_id] = FrmAppHelper::truncate( $form_col->name, 35 );
                 }
-				$columns[ $form_id . '_' . $col_id ] = FrmAppHelper::truncate( $form_col->name, 35 );
+				$columns[$form_id . '_' . $col_id] = FrmAppHelper::truncate( $form_col->name, 35 );
             }
         }
 
-		$columns[ $form_id . '_created_at' ] = __( 'Entry creation date', 'formidable' );
-		$columns[ $form_id . '_updated_at' ] = __( 'Entry update date', 'formidable' );
-		$columns[ $form_id . '_ip' ] = 'IP';
+		$columns[$form_id . '_created_at'] = __( 'Entry creation date', 'formidable' );
+		$columns[$form_id . '_updated_at'] = __( 'Entry update date', 'formidable' );
+		$columns[$form_id . '_ip'] = 'IP';
 
         $frm_vars['cols'] = $columns;
 
@@ -136,7 +136,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;
     }
@@ -145,25 +145,25 @@ 
 	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';
+		$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'] ) {
+        if ( ! isset( $frm_vars['prev_hidden_cols'] ) || ! $frm_vars['prev_hidden_cols'] ) {
             return; //don't continue if there's no previous value
         }
 
         foreach ( $meta_value as $mk => $mv ) {
             //remove blank values
-            if ( empty( $mv )  ) {
-                unset( $meta_value[ $mk ] );
+            if ( empty( $mv ) ) {
+                unset( $meta_value[$mk] );
             }
         }
 
-        $cur_form_prefix = reset($meta_value);
-        $cur_form_prefix = explode('_', $cur_form_prefix);
+        $cur_form_prefix = reset( $meta_value );
+        $cur_form_prefix = explode( '_', $cur_form_prefix );
         $cur_form_prefix = $cur_form_prefix[0];
         $save = false;
 
@@ -182,7 +182,7 @@ 
 
             $meta_value[] = $prev_hidden;
             $save = true;
-            unset($form_prefix);
+            unset( $form_prefix );
         }
 
 		if ( $save ) {
@@ -214,7 +214,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;
 			}
 		}
 
@@ -237,7 +237,7 @@ 
                     break;
                 }
 
-                unset($form_prefix);
+                unset( $form_prefix );
             }
         }
 
@@ -245,36 +245,36 @@ 
 			return $result;
 		}
 
-        $i = isset($frm_vars['cols']) ? count($frm_vars['cols']) : 0;
+        $i = isset( $frm_vars['cols'] ) ? count( $frm_vars['cols'] ) : 0;
         $max_columns = 8;
         if ( $i <= $max_columns ) {
 			return $result;
 		}
 
         global $frm_vars;
-        if ( isset($frm_vars['current_form']) && $frm_vars['current_form'] ) {
-            $frm_vars['current_form']->options = maybe_unserialize($frm_vars['current_form']->options);
+        if ( isset( $frm_vars['current_form'] ) && $frm_vars['current_form'] ) {
+            $frm_vars['current_form']->options = maybe_unserialize( $frm_vars['current_form']->options );
         }
 
-        if ( isset($frm_vars['current_form']) && $frm_vars['current_form'] && isset($frm_vars['current_form']->options['hidden_cols']) && ! empty($frm_vars['current_form']->options['hidden_cols']) ) {
+        if ( isset( $frm_vars['current_form'] ) && $frm_vars['current_form'] && isset( $frm_vars['current_form']->options['hidden_cols'] ) && ! empty( $frm_vars['current_form']->options['hidden_cols'] ) ) {
             $result = $frm_vars['current_form']->options['hidden_cols'];
         } else {
             $cols = $frm_vars['cols'];
-            $cols = array_reverse($cols, true);
+            $cols = array_reverse( $cols, true );
 
 			$result[] = $form_id . '_id';
-            $i--;
+            $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 );
             }
         }
 
@@ -311,14 +311,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' );
         }
 
@@ -327,7 +327,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' );
@@ -337,9 +337,9 @@ 
             }
         }
 
-        $entry = FrmEntry::getOne($id, true);
+        $entry = FrmEntry::getOne( $id, true );
 
-        $data = maybe_unserialize($entry->description);
+        $data = maybe_unserialize( $entry->description );
 		if ( ! is_array( $data ) || ! isset( $data['referrer'] ) ) {
 			$data = array( 'referrer' => $data );
 		}
@@ -351,14 +351,14 @@ 
     }
 
     public static function destroy() {
-        FrmAppHelper::permission_check('frm_delete_entries');
+        FrmAppHelper::permission_check( 'frm_delete_entries' );
 
 		$params = FrmForm::get_admin_params();
 
-        if ( isset($params['keep_post']) && $params['keep_post'] ) {
+        if ( isset( $params['keep_post'] ) && $params['keep_post'] ) {
             //unlink entry from post
             global $wpdb;
-			$wpdb->update( $wpdb->prefix .'frm_items', array( 'post_id' => '' ), array( 'id' => $params['id'] ) );
+			$wpdb->update( $wpdb->prefix . 'frm_items', array( 'post_id' => '' ), array( 'id' => $params['id'] ) );
         }
 
         $message = '';
@@ -433,9 +433,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;
         }
 
@@ -450,13 +450,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 );
                 }
             }
 
@@ -491,28 +491,28 @@ 
 	}
 
     public static function &filter_email_value( $value, $meta, $entry, $atts = array() ) {
-        $field = FrmField::getOne($meta->field_id);
+        $field = FrmField::getOne( $meta->field_id );
         if ( ! $field ) {
             return $value;
         }
 
-        $value = self::filter_display_value($value, $field, $atts);
+        $value = self::filter_display_value( $value, $field, $atts );
         return $value;
     }
 
 	public static function &filter_shortcode_value( $value, $tag, $atts, $field ) {
-        $plain_text = add_filter('frm_plain_text_email', true);
+        $plain_text = add_filter( 'frm_plain_text_email', true );
 		FrmEntryFormat::textarea_display_value( $field->type, $plain_text, $value );
 
-        if ( isset($atts['show']) && $atts['show'] == 'value' ) {
+        if ( isset( $atts['show'] ) && $atts['show'] == 'value' ) {
             return $value;
         }
 
-        return self::filter_display_value($value, $field, $atts);
+        return self::filter_display_value( $value, $field, $atts );
     }
 
     public static function &filter_display_value( $value, $field, $atts = array() ) {
-        $saved_value = ( isset($atts['saved_value']) && $atts['saved_value'] ) ? true : false;
+        $saved_value = ( isset( $atts['saved_value'] ) && $atts['saved_value'] ) ? true : false;
 		if ( ! in_array( $field->type, array( 'radio', 'checkbox', 'radio', 'select' ) ) || ! FrmField::is_option_true( $field, 'separate_value' ) || $saved_value ) {
             return $value;
         }
@@ -520,29 +520,29 @@ 
         $f_values = $f_labels = array();
 
         foreach ( $field->options as $opt_key => $opt ) {
-            if ( ! is_array($opt) ) {
+            if ( ! is_array( $opt ) ) {
                 continue;
             }
 
-            $f_labels[ $opt_key ] = isset( $opt['label'] ) ? $opt['label'] : reset($opt);
-            $f_values[ $opt_key ] = isset( $opt['value'] ) ? $opt['value'] : $f_labels[ $opt_key ];
-            if ( $f_labels[ $opt_key ] == $f_values[ $opt_key ] ) {
-                unset( $f_values[ $opt_key ], $f_labels[ $opt_key ] );
+            $f_labels[$opt_key] = isset( $opt['label'] ) ? $opt['label'] : reset( $opt );
+            $f_values[$opt_key] = isset( $opt['value'] ) ? $opt['value'] : $f_labels[$opt_key];
+            if ( $f_labels[$opt_key] == $f_values[$opt_key] ) {
+                unset( $f_values[$opt_key], $f_labels[$opt_key] );
             }
-            unset($opt_key, $opt);
+            unset( $opt_key, $opt );
         }
 
-        if ( ! empty($f_values) ) {
+        if ( ! empty( $f_values ) ) {
             foreach ( (array) $value as $v_key => $val ) {
-                if ( in_array($val, $f_values) ) {
-                    $opt = array_search($val, $f_values);
-                    if ( is_array($value) ) {
-                        $value[ $v_key ] = $f_labels[ $opt ];
+                if ( in_array( $val, $f_values ) ) {
+                    $opt = array_search( $val, $f_values );
+                    if ( is_array( $value ) ) {
+                        $value[$v_key] = $f_labels[$opt];
                     } else {
-                        $value = $f_labels[ $opt ];
+                        $value = $f_labels[$opt];
                     }
                 }
-                unset($v_key, $val);
+                unset( $v_key, $val );
             }
         }
 
@@ -555,9 +555,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/controllers/FrmFormsController.php

Indentation +596 added lines, -596 removed lines

@@ -2,7 +2,7 @@ 
 
 class FrmFormsController {
 
-    public static function menu() {
+	public static function menu() {
 		$menu_label = __( 'Forms', 'formidable' );
 		if ( ! FrmAppHelper::pro_is_installed() ) {
 			$menu_label .= ' (Lite)';
@@ -10,7 +10,7 @@ 
 		add_submenu_page('formidable', 'Formidable | ' . $menu_label, $menu_label, 'frm_view_forms', 'formidable', 'FrmFormsController::route' );
 
 		self::maybe_load_listing_hooks();
-    }
+	}
 
 	public static function maybe_load_listing_hooks() {
 		$action = FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' );
@@ -24,128 +24,128 @@ 
 		add_filter('manage_toplevel_page_formidable_sortable_columns', 'FrmFormsController::get_sortable_columns' );
 	}
 
-    public static function head() {
-        wp_enqueue_script('formidable-editinplace');
+	public static function head() {
+		wp_enqueue_script('formidable-editinplace');
 
-        if ( wp_is_mobile() ) {
-    		wp_enqueue_script( 'jquery-touch-punch' );
-    	}
-    }
+		if ( wp_is_mobile() ) {
+			wp_enqueue_script( 'jquery-touch-punch' );
+		}
+	}
 
-    public static function register_widgets() {
-        require_once(FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php');
-        register_widget('FrmShowForm');
-    }
+	public static function register_widgets() {
+		require_once(FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php');
+		register_widget('FrmShowForm');
+	}
 
-    public static function list_form() {
-        FrmAppHelper::permission_check('frm_view_forms');
+	public static function list_form() {
+		FrmAppHelper::permission_check('frm_view_forms');
 
 		$params = FrmForm::list_page_params();
-        $errors = self::process_bulk_form_actions( array());
-        $errors = apply_filters('frm_admin_list_form_action', $errors);
+		$errors = self::process_bulk_form_actions( array());
+		$errors = apply_filters('frm_admin_list_form_action', $errors);
 
 		return self::display_forms_list( $params, '', $errors );
-    }
+	}
 
 	public static function new_form( $values = array() ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check('frm_edit_forms');
 
-        global $frm_vars;
+		global $frm_vars;
 
-        $action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
+		$action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
 		$action = empty( $values ) ? FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' ) : $values[ $action ];
 
 		if ( $action == 'create' ) {
-            return self::create($values);
+			return self::create($values);
 		} else if ( $action == 'new' ) {
 			$frm_field_selection = FrmField::field_selection();
-            $values = FrmFormsHelper::setup_new_vars($values);
-            $id = FrmForm::create( $values );
-            $form = FrmForm::getOne($id);
+			$values = FrmFormsHelper::setup_new_vars($values);
+			$id = FrmForm::create( $values );
+			$form = FrmForm::getOne($id);
 
-            // add default email notification
-            $action_control = FrmFormActionsController::get_form_actions( 'email' );
-            $action_control->create($form->id);
+			// add default email notification
+			$action_control = FrmFormActionsController::get_form_actions( 'email' );
+			$action_control->create($form->id);
 
 			$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
-            $values['id'] = $id;
+			$values['id'] = $id;
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
-        }
-    }
+		}
+	}
 
 	public static function create( $values = array() ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check('frm_edit_forms');
 
-        global $frm_vars;
-        if ( empty( $values ) ) {
-            $values = $_POST;
-        }
+		global $frm_vars;
+		if ( empty( $values ) ) {
+			$values = $_POST;
+		}
 
-        //Set radio button and checkbox meta equal to "other" value
-        if ( FrmAppHelper::pro_is_installed() ) {
-            $values = FrmProEntry::mod_other_vals( $values, 'back' );
-        }
+		//Set radio button and checkbox meta equal to "other" value
+		if ( FrmAppHelper::pro_is_installed() ) {
+			$values = FrmProEntry::mod_other_vals( $values, 'back' );
+		}
 
 		$id = isset($values['id']) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
 
-        if ( ! current_user_can( 'frm_edit_forms' ) || ( $_POST && ( ! isset( $values['frm_save_form'] ) || ! wp_verify_nonce( $values['frm_save_form'], 'frm_save_form_nonce' ) ) ) ) {
-            $frm_settings = FrmAppHelper::get_settings();
-            $errors = array( 'form' => $frm_settings->admin_permission );
-        } else {
-            $errors = FrmForm::validate($values);
-        }
+		if ( ! current_user_can( 'frm_edit_forms' ) || ( $_POST && ( ! isset( $values['frm_save_form'] ) || ! wp_verify_nonce( $values['frm_save_form'], 'frm_save_form_nonce' ) ) ) ) {
+			$frm_settings = FrmAppHelper::get_settings();
+			$errors = array( 'form' => $frm_settings->admin_permission );
+		} else {
+			$errors = FrmForm::validate($values);
+		}
 
-        if ( count($errors) > 0 ) {
-            $hide_preview = true;
+		if ( count($errors) > 0 ) {
+			$hide_preview = true;
 			$frm_field_selection = FrmField::field_selection();
-            $form = FrmForm::getOne( $id );
-            $fields = FrmField::get_all_for_form($id);
+			$form = FrmForm::getOne( $id );
+			$fields = FrmField::get_all_for_form($id);
 
-            $values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
+			$values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
 			$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
-        } else {
-            FrmForm::update( $id, $values, true );
+		} else {
+			FrmForm::update( $id, $values, true );
 			$url = admin_url( 'admin.php?page=formidable&frm_action=settings&id=' . $id );
 			die( FrmAppHelper::js_redirect( $url ) );
-        }
-    }
+		}
+	}
 
-    public static function edit( $values = false ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+	public static function edit( $values = false ) {
+		FrmAppHelper::permission_check('frm_edit_forms');
 
 		$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
-        return self::get_edit_vars($id);
-    }
+		return self::get_edit_vars($id);
+	}
 
-    public static function settings( $id = false, $message = '' ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+	public static function settings( $id = false, $message = '' ) {
+		FrmAppHelper::permission_check('frm_edit_forms');
 
-        if ( ! $id || ! is_numeric($id) ) {
+		if ( ! $id || ! is_numeric($id) ) {
 			$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
-        }
+		}
 		return self::get_settings_vars( $id, array(), $message );
-    }
+	}
 
-    public static function update_settings() {
-        FrmAppHelper::permission_check('frm_edit_forms');
+	public static function update_settings() {
+		FrmAppHelper::permission_check('frm_edit_forms');
 
 		$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
 
-        $errors = FrmForm::validate($_POST);
-        if ( count($errors) > 0 ) {
-            return self::get_settings_vars($id, $errors);
-        }
+		$errors = FrmForm::validate($_POST);
+		if ( count($errors) > 0 ) {
+			return self::get_settings_vars($id, $errors);
+		}
 
-        do_action('frm_before_update_form_settings', $id);
+		do_action('frm_before_update_form_settings', $id);
 
 		FrmForm::update( $id, $_POST );
 
-        $message = __( 'Settings Successfully Updated', 'formidable' );
+		$message = __( 'Settings Successfully Updated', 'formidable' );
 		return self::get_settings_vars( $id, array(), $message );
-    }
+	}
 
 	public static function edit_key() {
 		$values = self::edit_in_place_value( 'form_key' );
@@ -175,43 +175,43 @@ 
 
 	public static function update( $values = array() ) {
 		if ( empty( $values ) ) {
-            $values = $_POST;
-        }
+			$values = $_POST;
+		}
 
-        //Set radio button and checkbox meta equal to "other" value
-        if ( FrmAppHelper::pro_is_installed() ) {
-            $values = FrmProEntry::mod_other_vals( $values, 'back' );
-        }
+		//Set radio button and checkbox meta equal to "other" value
+		if ( FrmAppHelper::pro_is_installed() ) {
+			$values = FrmProEntry::mod_other_vals( $values, 'back' );
+		}
 
-        $errors = FrmForm::validate( $values );
-        $permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
-        if ( $permission_error !== false ) {
-            $errors['form'] = $permission_error;
-        }
+		$errors = FrmForm::validate( $values );
+		$permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
+		if ( $permission_error !== false ) {
+			$errors['form'] = $permission_error;
+		}
 
 		$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
 
 		if ( count( $errors ) > 0 ) {
-            return self::get_edit_vars( $id, $errors );
+			return self::get_edit_vars( $id, $errors );
 		} else {
-            FrmForm::update( $id, $values );
-            $message = __( 'Form was Successfully Updated', 'formidable' );
-            if ( defined( 'DOING_AJAX' ) ) {
+			FrmForm::update( $id, $values );
+			$message = __( 'Form was Successfully Updated', 'formidable' );
+			if ( defined( 'DOING_AJAX' ) ) {
 				wp_die( $message );
-            }
+			}
 			return self::get_edit_vars( $id, array(), $message );
-        }
-    }
+		}
+	}
 
-    public static function bulk_create_template( $ids ) {
-        FrmAppHelper::permission_check( 'frm_edit_forms' );
+	public static function bulk_create_template( $ids ) {
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
 
-        foreach ( $ids as $id ) {
-            FrmForm::duplicate( $id, true, true );
-        }
+		foreach ( $ids as $id ) {
+			FrmForm::duplicate( $id, true, true );
+		}
 
-        return __( 'Form template was Successfully Created', 'formidable' );
-    }
+		return __( 'Form template was Successfully Created', 'formidable' );
+	}
 
 	/**
 	 * Redirect to the url for creating from a template
@@ -233,45 +233,45 @@ 
 		wp_die();
 	}
 
-    public static function duplicate() {
-        FrmAppHelper::permission_check('frm_edit_forms');
+	public static function duplicate() {
+		FrmAppHelper::permission_check('frm_edit_forms');
 
 		$params = FrmForm::list_page_params();
-        $form = FrmForm::duplicate( $params['id'], $params['template'], true );
-        $message = ($params['template']) ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' );
-        if ( $form ) {
+		$form = FrmForm::duplicate( $params['id'], $params['template'], true );
+		$message = ($params['template']) ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' );
+		if ( $form ) {
 			return self::get_edit_vars( $form, array(), $message, true );
-        } else {
-            return self::display_forms_list($params, __( 'There was a problem creating the new template.', 'formidable' ));
-        }
-    }
+		} else {
+			return self::display_forms_list($params, __( 'There was a problem creating the new template.', 'formidable' ));
+		}
+	}
 
-    public static function page_preview() {
+	public static function page_preview() {
 		$params = FrmForm::list_page_params();
-        if ( ! $params['form'] ) {
-            return;
-        }
-
-        $form = FrmForm::getOne( $params['form'] );
-        if ( ! $form ) {
-            return;
-        }
-        return self::show_form( $form->id, '', true, true );
-    }
-
-    public static function preview() {
-        do_action( 'frm_wp' );
-
-        global $frm_vars;
-        $frm_vars['preview'] = true;
-
-        if ( ! defined( 'ABSPATH' ) && ! defined( 'XMLRPC_REQUEST' ) ) {
-            global $wp;
-            $root = dirname( dirname( dirname( dirname( __FILE__ ) ) ) );
+		if ( ! $params['form'] ) {
+			return;
+		}
+
+		$form = FrmForm::getOne( $params['form'] );
+		if ( ! $form ) {
+			return;
+		}
+		return self::show_form( $form->id, '', true, true );
+	}
+
+	public static function preview() {
+		do_action( 'frm_wp' );
+
+		global $frm_vars;
+		$frm_vars['preview'] = true;
+
+		if ( ! defined( 'ABSPATH' ) && ! defined( 'XMLRPC_REQUEST' ) ) {
+			global $wp;
+			$root = dirname( dirname( dirname( dirname( __FILE__ ) ) ) );
 			include_once( $root . '/wp-config.php' );
-            $wp->init();
-            $wp->register_globals();
-        }
+			$wp->init();
+			$wp->register_globals();
+		}
 
 		self::register_pro_scripts();
 
@@ -285,11 +285,11 @@ 
 		$form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
 		if ( empty( $form ) ) {
 			$form = FrmForm::getAll( array(), '', 1 );
-        }
+		}
 
 		require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php' );
-        wp_die();
-    }
+		wp_die();
+	}
 
 	public static function register_pro_scripts() {
 		if ( FrmAppHelper::pro_is_installed() ) {
@@ -299,22 +299,22 @@ 
 		}
 	}
 
-    public static function untrash() {
+	public static function untrash() {
 		self::change_form_status( 'untrash' );
-    }
+	}
 
 	public static function bulk_untrash( $ids ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check('frm_edit_forms');
 
-        $count = FrmForm::set_status( $ids, 'published' );
+		$count = FrmForm::set_status( $ids, 'published' );
 
-        $message = sprintf(_n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
-        return $message;
-    }
+		$message = sprintf(_n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
+		return $message;
+	}
 
-    public static function trash() {
+	public static function trash() {
 		self::change_form_status( 'trash' );
-    }
+	}
 
 	/**
 	 * @param string $status
@@ -352,68 +352,68 @@ 
 	}
 
 	public static function bulk_trash( $ids ) {
-        FrmAppHelper::permission_check('frm_delete_forms');
+		FrmAppHelper::permission_check('frm_delete_forms');
 
-        $count = 0;
-        foreach ( $ids as $id ) {
-            if ( FrmForm::trash( $id ) ) {
-                $count++;
-            }
-        }
+		$count = 0;
+		foreach ( $ids as $id ) {
+			if ( FrmForm::trash( $id ) ) {
+				$count++;
+			}
+		}
 
-        $current_page = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
+		$current_page = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
 		$message = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=list&action=bulk_untrash&form_type=' . $current_page . '&item-action[]=' . implode( 'item-action[]=', $ids ), 'bulk-toplevel_page_formidable' ) ) . '">', '</a>' );
 
-        return $message;
-    }
+		return $message;
+	}
 
-    public static function destroy() {
-        FrmAppHelper::permission_check('frm_delete_forms');
+	public static function destroy() {
+		FrmAppHelper::permission_check('frm_delete_forms');
 
 		$params = FrmForm::list_page_params();
 
-        //check nonce url
-        check_admin_referer('destroy_form_' . $params['id']);
+		//check nonce url
+		check_admin_referer('destroy_form_' . $params['id']);
 
-        $count = 0;
-        if ( FrmForm::destroy( $params['id'] ) ) {
-            $count++;
-        }
+		$count = 0;
+		if ( FrmForm::destroy( $params['id'] ) ) {
+			$count++;
+		}
 
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+		$message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
 
 		self::display_forms_list( $params, $message );
-    }
+	}
 
 	public static function bulk_destroy( $ids ) {
-        FrmAppHelper::permission_check('frm_delete_forms');
+		FrmAppHelper::permission_check('frm_delete_forms');
 
-        $count = 0;
-        foreach ( $ids as $id ) {
-            $d = FrmForm::destroy( $id );
-            if ( $d ) {
-                $count++;
-            }
-        }
+		$count = 0;
+		foreach ( $ids as $id ) {
+			$d = FrmForm::destroy( $id );
+			if ( $d ) {
+				$count++;
+			}
+		}
 
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+		$message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
 
-        return $message;
-    }
+		return $message;
+	}
 
-    private static function delete_all() {
-        //check nonce url
-        $permission_error = FrmAppHelper::permission_nonce_error('frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable');
-        if ( $permission_error !== false ) {
+	private static function delete_all() {
+		//check nonce url
+		$permission_error = FrmAppHelper::permission_nonce_error('frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable');
+		if ( $permission_error !== false ) {
 			self::display_forms_list( array(), '', array( $permission_error ) );
-            return;
-        }
+			return;
+		}
 
 		$count = FrmForm::scheduled_delete( time() );
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+		$message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
 
 		self::display_forms_list( array(), $message );
-    }
+	}
 
 	public static function scheduled_delete( $delete_timestamp = '' ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmForm::scheduled_delete' );
@@ -421,11 +421,11 @@ 
 	}
 
 	/**
-	* Inserts Formidable button
-	* Hook exists since 2.5.0
-	*
-	* @since 2.0.15
-	*/
+	 * Inserts Formidable button
+	 * Hook exists since 2.5.0
+	 *
+	 * @since 2.0.15
+	 */
 	public static function insert_form_button() {
 		if ( current_user_can('frm_view_forms') ) {
 			$menu_name = FrmAppHelper::get_menu_name();
@@ -436,49 +436,49 @@ 
 		}
 	}
 
-    public static function insert_form_popup() {
+	public static function insert_form_popup() {
 		$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
 		if ( ! in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ) ) ) {
-            return;
-        }
+			return;
+		}
 
-        FrmAppHelper::load_admin_wide_js();
+		FrmAppHelper::load_admin_wide_js();
 
-        $shortcodes = array(
+		$shortcodes = array(
 			'formidable' => array( 'name' => __( 'Form', 'formidable' ), 'label' => __( 'Insert a Form', 'formidable' ) ),
-        );
+		);
 
-        $shortcodes = apply_filters('frm_popup_shortcodes', $shortcodes);
+		$shortcodes = apply_filters('frm_popup_shortcodes', $shortcodes);
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php' );
-    }
+	}
 
-    public static function get_shortcode_opts() {
+	public static function get_shortcode_opts() {
 		FrmAppHelper::permission_check('frm_view_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
-        if ( empty($shortcode) ) {
-            wp_die();
-        }
+		if ( empty($shortcode) ) {
+			wp_die();
+		}
 
 		echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
 		echo '<input type="radio" name="frmsc" value="' . esc_attr( $shortcode ) . '" id="sc-' . esc_attr( $shortcode ) . '" class="frm_hidden" />';
 
-        $form_id = '';
-        $opts = array();
+		$form_id = '';
+		$opts = array();
 		switch ( $shortcode ) {
-            case 'formidable':
-                $opts = array(
+			case 'formidable':
+				$opts = array(
 					'form_id'       => 'id',
-                    //'key' => ',
+					//'key' => ',
 					'title'         => array( 'val' => 1, 'label' => __( 'Display form title', 'formidable' ) ),
 					'description'   => array( 'val' => 1, 'label' => __( 'Display form description', 'formidable' ) ),
 					'minimize'      => array( 'val' => 1, 'label' => __( 'Minimize form HTML', 'formidable' ) ),
-                );
-            break;
-        }
-        $opts = apply_filters('frm_sc_popup_opts', $opts, $shortcode);
+				);
+			break;
+		}
+		$opts = apply_filters('frm_sc_popup_opts', $opts, $shortcode);
 
 		if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
 			// allow other shortcodes to use the required form id option
@@ -488,61 +488,61 @@ 
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php' );
 
-        echo '</div>';
+		echo '</div>';
 
-        wp_die();
-    }
+		wp_die();
+	}
 
 	public static function display_forms_list( $params = array(), $message = '', $errors = array(), $deprecated_errors = array() ) {
-        FrmAppHelper::permission_check( 'frm_view_forms' );
+		FrmAppHelper::permission_check( 'frm_view_forms' );
 		if ( ! empty( $deprecated_errors ) ) {
 			$errors = $deprecated_errors;
 			_deprecated_argument( 'errors', '2.0.8' );
 		}
 
-        global $wpdb, $frm_vars;
+		global $wpdb, $frm_vars;
 
 		if ( empty( $params ) ) {
 			$params = FrmForm::list_page_params();
-        }
+		}
 
-        $wp_list_table = new FrmFormsListHelper( compact( 'params' ) );
+		$wp_list_table = new FrmFormsListHelper( compact( '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 ) {
 			wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
-            die();
-        }
+			die();
+		}
 
 		require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php' );
-    }
+	}
 
 	public static function get_columns( $columns ) {
-	    $columns['cb'] = '<input type="checkbox" />';
-	    $columns['id'] = 'ID';
+		$columns['cb'] = '<input type="checkbox" />';
+		$columns['id'] = 'ID';
 
-        $type = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : 'published';
+		$type = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : 'published';
 
-        if ( 'template' == $type ) {
-            $columns['name']        = __( 'Template Name', 'formidable' );
-            $columns['type']        = __( 'Type', 'formidable' );
-            $columns['form_key']    = __( 'Key', 'formidable' );
-        } else {
-            $columns['name']        = __( 'Form Title', 'formidable' );
-            $columns['entries']     = __( 'Entries', 'formidable' );
-            $columns['form_key']    = __( 'Key', 'formidable' );
-            $columns['shortcode']   = __( 'Shortcodes', 'formidable' );
-        }
+		if ( 'template' == $type ) {
+			$columns['name']        = __( 'Template Name', 'formidable' );
+			$columns['type']        = __( 'Type', 'formidable' );
+			$columns['form_key']    = __( 'Key', 'formidable' );
+		} else {
+			$columns['name']        = __( 'Form Title', 'formidable' );
+			$columns['entries']     = __( 'Entries', 'formidable' );
+			$columns['form_key']    = __( 'Key', 'formidable' );
+			$columns['shortcode']   = __( 'Shortcodes', 'formidable' );
+		}
 
-        $columns['created_at'] = __( 'Date', 'formidable' );
+		$columns['created_at'] = __( 'Date', 'formidable' );
 
 		add_screen_option( 'per_page', array( 'label' => __( 'Forms', 'formidable' ), 'default' => 20, 'option' => 'formidable_page_formidable_per_page' ) );
 
-        return $columns;
+		return $columns;
 	}
 
 	public static function get_sortable_columns() {
@@ -556,110 +556,110 @@ 
 	}
 
 	public static function hidden_columns( $result ) {
-        $return = false;
-        foreach ( (array) $result as $r ) {
-            if ( ! empty( $r ) ) {
-                $return = true;
-                break;
-            }
-        }
+		$return = false;
+		foreach ( (array) $result as $r ) {
+			if ( ! empty( $r ) ) {
+				$return = true;
+				break;
+			}
+		}
 
-        if ( $return ) {
-            return $result;
+		if ( $return ) {
+			return $result;
 		}
 
-        $type = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
+		$type = isset( $_REQUEST['form_type'] ) ? $_REQUEST['form_type'] : '';
 
-        $result[] = 'created_at';
-        if ( $type == 'template' ) {
-            $result[] = 'id';
-            $result[] = 'form_key';
-        }
+		$result[] = 'created_at';
+		if ( $type == 'template' ) {
+			$result[] = 'id';
+			$result[] = 'form_key';
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
 	public static function save_per_page( $save, $option, $value ) {
-        if ( $option == 'formidable_page_formidable_per_page' ) {
-            $save = (int) $value;
-        }
-        return $save;
-    }
+		if ( $option == 'formidable_page_formidable_per_page' ) {
+			$save = (int) $value;
+		}
+		return $save;
+	}
 
 	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
-        global $frm_vars;
+		global $frm_vars;
 
-        $form = FrmForm::getOne( $id );
-        if ( ! $form ) {
-            wp_die( __( 'You are trying to edit a form that does not exist.', 'formidable' ) );
-        }
+		$form = FrmForm::getOne( $id );
+		if ( ! $form ) {
+			wp_die( __( 'You are trying to edit a form that does not exist.', 'formidable' ) );
+		}
 
-        if ( $form->parent_form_id ) {
+		if ( $form->parent_form_id ) {
 			wp_die( sprintf( __( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form->parent_form_id ) ) . '">', '</a>' ));
-        }
+		}
 
 		$frm_field_selection = FrmField::field_selection();
-        $fields = FrmField::get_all_for_form($form->id);
+		$fields = FrmField::get_all_for_form($form->id);
 
-        // Automatically add end section fields if they don't exist (2.0 migration)
-        $reset_fields = false;
-        FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
+		// Automatically add end section fields if they don't exist (2.0 migration)
+		$reset_fields = false;
+		FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
 
-        if ( $reset_fields ) {
-            $fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
-        }
+		if ( $reset_fields ) {
+			$fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
+		}
 
-        unset($end_section_values, $last_order, $open, $reset_fields);
+		unset($end_section_values, $last_order, $open, $reset_fields);
 
-        $values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
+		$values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
 
-        $edit_message = __( 'Form was Successfully Updated', 'formidable' );
-        if ( $form->is_template && $message == $edit_message ) {
-            $message = __( 'Template was Successfully Updated', 'formidable' );
-        }
+		$edit_message = __( 'Form was Successfully Updated', 'formidable' );
+		if ( $form->is_template && $message == $edit_message ) {
+			$message = __( 'Template was Successfully Updated', 'formidable' );
+		}
 
 		$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
-        if ( $form->default_template ) {
-            wp_die(__( 'That template cannot be edited', 'formidable' ));
-        } else if ( defined('DOING_AJAX') ) {
-            wp_die();
-        } else if ( $create_link ) {
+		if ( $form->default_template ) {
+			wp_die(__( 'That template cannot be edited', 'formidable' ));
+		} else if ( defined('DOING_AJAX') ) {
+			wp_die();
+		} else if ( $create_link ) {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
-        } else {
+		} else {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' );
-        }
-    }
+		}
+	}
 
 	public static function get_settings_vars( $id, $errors = array(), $message = '' ) {
 		FrmAppHelper::permission_check( 'frm_edit_forms' );
 
-        global $frm_vars;
+		global $frm_vars;
 
-        $form = FrmForm::getOne( $id );
+		$form = FrmForm::getOne( $id );
 
-        $fields = FrmField::get_all_for_form($id);
-        $values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
+		$fields = FrmField::get_all_for_form($id);
+		$values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
 
-        if ( isset($values['default_template']) && $values['default_template'] ) {
-            wp_die(__( 'That template cannot be edited', 'formidable' ));
-        }
+		if ( isset($values['default_template']) && $values['default_template'] ) {
+			wp_die(__( 'That template cannot be edited', 'formidable' ));
+		}
 
-        $action_controls = FrmFormActionsController::get_form_actions();
+		$action_controls = FrmFormActionsController::get_form_actions();
 
-        $sections = apply_filters('frm_add_form_settings_section', array(), $values);
-        $pro_feature = FrmAppHelper::pro_is_installed() ? '' : ' class="pro_feature"';
+		$sections = apply_filters('frm_add_form_settings_section', array(), $values);
+		$pro_feature = FrmAppHelper::pro_is_installed() ? '' : ' class="pro_feature"';
 
-        $styles = apply_filters('frm_get_style_opts', array());
+		$styles = apply_filters('frm_get_style_opts', array());
 
 		require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
-    }
+	}
 
-    public static function mb_tags_box( $form_id, $class = '' ) {
-        $fields = FrmField::get_all_for_form($form_id, '', 'include');
-        $linked_forms = array();
-        $col = 'one';
-        $settings_tab = FrmAppHelper::is_admin_page('formidable' ) ? true : false;
+	public static function mb_tags_box( $form_id, $class = '' ) {
+		$fields = FrmField::get_all_for_form($form_id, '', 'include');
+		$linked_forms = array();
+		$col = 'one';
+		$settings_tab = FrmAppHelper::is_admin_page('formidable' ) ? true : false;
 
 		$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
 		$adv_shortcodes = self::get_advanced_shortcodes();
@@ -667,7 +667,7 @@ 
 		$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php' );
-    }
+	}
 
 	/**
 	 * Get an array of the options to display in the advanced tab
@@ -708,7 +708,7 @@ 
 			''          => '',
 			'siteurl'   => __( 'Site URL', 'formidable' ),
 			'sitename'  => __( 'Site Name', 'formidable' ),
-        );
+		);
 
 		if ( ! FrmAppHelper::pro_is_installed() ) {
 			unset( $entry_shortcodes['post_id'] );
@@ -735,39 +735,39 @@ 
 		return $entry_shortcodes;
 	}
 
-    // Insert the form class setting into the form
+	// Insert the form class setting into the form
 	public static function form_classes( $form ) {
-        if ( isset($form->options['form_class']) ) {
+		if ( isset($form->options['form_class']) ) {
 			echo esc_attr( sanitize_text_field( $form->options['form_class'] ) );
-        }
-    }
+		}
+	}
 
-    public static function get_email_html() {
+	public static function get_email_html() {
 		FrmAppHelper::permission_check('frm_view_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 		echo FrmEntryFormat::show_entry( array(
 			'form_id'       => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
-	        'default_email' => true,
+			'default_email' => true,
 			'plain_text'    => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ),
-	    ) );
-	    wp_die();
+		) );
+		wp_die();
 	}
 
-    public static function filter_content( $content, $form, $entry = false ) {
+	public static function filter_content( $content, $form, $entry = false ) {
 		self::get_entry_by_param( $entry );
-        if ( ! $entry ) {
-            return $content;
-        }
+		if ( ! $entry ) {
+			return $content;
+		}
 
-        if ( is_object( $form ) ) {
-            $form = $form->id;
-        }
+		if ( is_object( $form ) ) {
+			$form = $form->id;
+		}
 
-        $shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
-        $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
+		$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
+		$content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
 
-        return $content;
-    }
+		return $content;
+	}
 
 	private static function get_entry_by_param( &$entry ) {
 		if ( ! $entry || ! is_object( $entry ) ) {
@@ -779,287 +779,287 @@ 
 		}
 	}
 
-    public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
-        return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
-    }
+	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
+		return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
+	}
 
-    public static function process_bulk_form_actions( $errors ) {
-        if ( ! $_REQUEST ) {
-            return $errors;
-        }
+	public static function process_bulk_form_actions( $errors ) {
+		if ( ! $_REQUEST ) {
+			return $errors;
+		}
 
 		$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
-        if ( $bulkaction == -1 ) {
+		if ( $bulkaction == -1 ) {
 			$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
-        }
-
-        if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
-            FrmAppHelper::remove_get_action();
-
-            $bulkaction = str_replace( 'bulk_', '', $bulkaction );
-        }
-
-        $ids = FrmAppHelper::get_param( 'item-action', '' );
-        if ( empty( $ids ) ) {
-            $errors[] = __( 'No forms were specified', 'formidable' );
-            return $errors;
-        }
-
-        $permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
-        if ( $permission_error !== false ) {
-            $errors[] = $permission_error;
-            return $errors;
-        }
-
-        if ( ! is_array( $ids ) ) {
-            $ids = explode( ',', $ids );
-        }
-
-        switch ( $bulkaction ) {
-            case 'delete':
-                $message = self::bulk_destroy( $ids );
-            break;
-            case 'trash':
-                $message = self::bulk_trash( $ids );
-            break;
-            case 'untrash':
-                $message = self::bulk_untrash( $ids );
-            break;
-            case 'create_template':
-                $message = self::bulk_create_template( $ids );
-            break;
-        }
-
-        if ( isset( $message ) && ! empty( $message ) ) {
+		}
+
+		if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
+			FrmAppHelper::remove_get_action();
+
+			$bulkaction = str_replace( 'bulk_', '', $bulkaction );
+		}
+
+		$ids = FrmAppHelper::get_param( 'item-action', '' );
+		if ( empty( $ids ) ) {
+			$errors[] = __( 'No forms were specified', 'formidable' );
+			return $errors;
+		}
+
+		$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
+		if ( $permission_error !== false ) {
+			$errors[] = $permission_error;
+			return $errors;
+		}
+
+		if ( ! is_array( $ids ) ) {
+			$ids = explode( ',', $ids );
+		}
+
+		switch ( $bulkaction ) {
+			case 'delete':
+				$message = self::bulk_destroy( $ids );
+			break;
+			case 'trash':
+				$message = self::bulk_trash( $ids );
+			break;
+			case 'untrash':
+				$message = self::bulk_untrash( $ids );
+			break;
+			case 'create_template':
+				$message = self::bulk_create_template( $ids );
+			break;
+		}
+
+		if ( isset( $message ) && ! empty( $message ) ) {
 			echo '<div id="message" class="updated frm_msg_padding">' . FrmAppHelper::kses( $message ) . '</div>';
-        }
+		}
 
-        return $errors;
-    }
+		return $errors;
+	}
 
-    public static function add_default_templates( $path, $default = true, $template = true ) {
-        _deprecated_function( __FUNCTION__, '1.07.05', 'FrmXMLController::add_default_templates()' );
+	public static function add_default_templates( $path, $default = true, $template = true ) {
+		_deprecated_function( __FUNCTION__, '1.07.05', 'FrmXMLController::add_default_templates()' );
 
-        $path = untrailingslashit(trim($path));
+		$path = untrailingslashit(trim($path));
 		$templates = glob( $path . '/*.php' );
 
 		for ( $i = count( $templates ) - 1; $i >= 0; $i-- ) {
 			$filename = str_replace( '.php', '', str_replace( $path . '/', '', $templates[ $i ] ) );
 			$template_query = array( 'form_key' => $filename );
-            if ( $template ) {
-                $template_query['is_template'] = 1;
-            }
-            if ( $default ) {
-                $template_query['default_template'] = 1;
-            }
+			if ( $template ) {
+				$template_query['is_template'] = 1;
+			}
+			if ( $default ) {
+				$template_query['default_template'] = 1;
+			}
 			$form = FrmForm::getAll( $template_query, '', 1 );
 
-            $values = FrmFormsHelper::setup_new_vars();
-            $values['form_key'] = $filename;
-            $values['is_template'] = $template;
-            $values['status'] = 'published';
-            if ( $default ) {
-                $values['default_template'] = 1;
-            }
-
-            include( $templates[ $i ] );
-
-            //get updated form
-            if ( isset($form) && ! empty($form) ) {
-                $old_id = $form->id;
-                $form = FrmForm::getOne($form->id);
-            } else {
-                $old_id = false;
+			$values = FrmFormsHelper::setup_new_vars();
+			$values['form_key'] = $filename;
+			$values['is_template'] = $template;
+			$values['status'] = 'published';
+			if ( $default ) {
+				$values['default_template'] = 1;
+			}
+
+			include( $templates[ $i ] );
+
+			//get updated form
+			if ( isset($form) && ! empty($form) ) {
+				$old_id = $form->id;
+				$form = FrmForm::getOne($form->id);
+			} else {
+				$old_id = false;
 				$form = FrmForm::getAll( $template_query, '', 1 );
-            }
+			}
 
-            if ( $form ) {
+			if ( $form ) {
 				do_action( 'frm_after_duplicate_form', $form->id, (array) $form, array( 'old_id' => $old_id ) );
-            }
-        }
-    }
+			}
+		}
+	}
 
-    public static function route() {
-        $action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
-        $vars = array();
+	public static function route() {
+		$action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
+		$vars = array();
 		if ( isset( $_POST['frm_compact_fields'] ) ) {
 			FrmAppHelper::permission_check( 'frm_edit_forms' );
 
-            $json_vars = htmlspecialchars_decode(nl2br(stripslashes(str_replace('&quot;', '\\\"', $_POST['frm_compact_fields'] ))));
-            $json_vars = json_decode($json_vars, true);
-            if ( empty($json_vars) ) {
-                // json decoding failed so we should return an error message
+			$json_vars = htmlspecialchars_decode(nl2br(stripslashes(str_replace('&quot;', '\\\"', $_POST['frm_compact_fields'] ))));
+			$json_vars = json_decode($json_vars, true);
+			if ( empty($json_vars) ) {
+				// json decoding failed so we should return an error message
 				$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
-                if ( 'edit' == $action ) {
-                    $action = 'update';
-                }
-
-                add_filter('frm_validate_form', 'FrmFormsController::json_error');
-            } else {
-                $vars = FrmAppHelper::json_to_array($json_vars);
-                $action = $vars[ $action ];
+				if ( 'edit' == $action ) {
+					$action = 'update';
+				}
+
+				add_filter('frm_validate_form', 'FrmFormsController::json_error');
+			} else {
+				$vars = FrmAppHelper::json_to_array($json_vars);
+				$action = $vars[ $action ];
 				unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] );
 				$_REQUEST = array_merge( $_REQUEST, $vars );
 				$_POST = array_merge( $_POST, $_REQUEST );
-            }
-        } else {
+			}
+		} else {
 			$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
-    		if ( isset( $_REQUEST['delete_all'] ) ) {
-                // override the action for this page
-    			$action = 'delete_all';
-            }
-        }
+			if ( isset( $_REQUEST['delete_all'] ) ) {
+				// override the action for this page
+				$action = 'delete_all';
+			}
+		}
 
 		add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
-        FrmAppHelper::trigger_hook_load( 'form' );
-
-        switch ( $action ) {
-            case 'new':
-                return self::new_form($vars);
-            case 'create':
-            case 'edit':
-            case 'update':
-            case 'duplicate':
-            case 'trash':
-            case 'untrash':
-            case 'destroy':
-            case 'delete_all':
-            case 'settings':
-            case 'update_settings':
+		FrmAppHelper::trigger_hook_load( 'form' );
+
+		switch ( $action ) {
+			case 'new':
+				return self::new_form($vars);
+			case 'create':
+			case 'edit':
+			case 'update':
+			case 'duplicate':
+			case 'trash':
+			case 'untrash':
+			case 'destroy':
+			case 'delete_all':
+			case 'settings':
+			case 'update_settings':
 				return self::$action( $vars );
-            default:
+			default:
 				do_action( 'frm_form_action_' . $action );
 				if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
-                    return;
-                }
+					return;
+				}
 
 				$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
-                if ( $action == -1 ) {
+				if ( $action == -1 ) {
 					$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
-                }
+				}
 
-                if ( strpos($action, 'bulk_') === 0 ) {
-                    FrmAppHelper::remove_get_action();
-                    return self::list_form();
-                }
+				if ( strpos($action, 'bulk_') === 0 ) {
+					FrmAppHelper::remove_get_action();
+					return self::list_form();
+				}
 
-                return self::display_forms_list();
-        }
-    }
+				return self::display_forms_list();
+		}
+	}
 
-    public static function json_error( $errors ) {
-        $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
-        return $errors;
-    }
+	public static function json_error( $errors ) {
+		$errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
+		return $errors;
+	}
 
 
-    /* FRONT-END FORMS */
-    public static function admin_bar_css() {
+	/* FRONT-END FORMS */
+	public static function admin_bar_css() {
 		if ( is_admin() || ! current_user_can( 'frm_edit_forms' ) ) {
-            return;
-        }
+			return;
+		}
 
 		add_action( 'wp_before_admin_bar_render', 'FrmFormsController::admin_bar_configure' );
 		FrmAppHelper::load_font_style();
 	}
 
 	public static function admin_bar_configure() {
-        global $frm_vars;
-        if ( empty($frm_vars['forms_loaded']) ) {
-            return;
-        }
-
-        $actions = array();
-        foreach ( $frm_vars['forms_loaded'] as $form ) {
-            if ( is_object($form) ) {
-                $actions[ $form->id ] = $form->name;
-            }
-            unset($form);
-        }
-
-        if ( empty($actions) ) {
-            return;
-        }
-
-        asort($actions);
-
-        global $wp_admin_bar;
-
-        if ( count($actions) == 1 ) {
-            $wp_admin_bar->add_menu( array(
-                'title' => 'Edit Form',
+		global $frm_vars;
+		if ( empty($frm_vars['forms_loaded']) ) {
+			return;
+		}
+
+		$actions = array();
+		foreach ( $frm_vars['forms_loaded'] as $form ) {
+			if ( is_object($form) ) {
+				$actions[ $form->id ] = $form->name;
+			}
+			unset($form);
+		}
+
+		if ( empty($actions) ) {
+			return;
+		}
+
+		asort($actions);
+
+		global $wp_admin_bar;
+
+		if ( count($actions) == 1 ) {
+			$wp_admin_bar->add_menu( array(
+				'title' => 'Edit Form',
 				'href'  => admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . current( array_keys( $actions ) ) ),
-                'id'    => 'frm-forms',
-            ) );
-        } else {
-            $wp_admin_bar->add_menu( array(
-        		'id'    => 'frm-forms',
-        		'title' => '<span class="ab-icon"></span><span class="ab-label">' . __( 'Edit Forms', 'formidable' ) . '</span>',
+				'id'    => 'frm-forms',
+			) );
+		} else {
+			$wp_admin_bar->add_menu( array(
+				'id'    => 'frm-forms',
+				'title' => '<span class="ab-icon"></span><span class="ab-label">' . __( 'Edit Forms', 'formidable' ) . '</span>',
 				'href'  => admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . current( array_keys( $actions ) ) ),
-        		'meta'  => array(
+				'meta'  => array(
 					'title' => __( 'Edit Forms', 'formidable' ),
-        		),
-        	) );
+				),
+			) );
 
-        	foreach ( $actions as $form_id => $name ) {
+			foreach ( $actions as $form_id => $name ) {
 
-        		$wp_admin_bar->add_menu( array(
-        			'parent'    => 'frm-forms',
+				$wp_admin_bar->add_menu( array(
+					'parent'    => 'frm-forms',
 					'id'        => 'edit_form_' . $form_id,
-        			'title'     => empty($name) ? __( '(no title)') : $name,
+					'title'     => empty($name) ? __( '(no title)') : $name,
 					'href'      => admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form_id ),
-        		) );
-        	}
-        }
-    }
+				) );
+			}
+		}
+	}
 
-    //formidable shortcode
+	//formidable shortcode
 	public static function get_form_shortcode( $atts ) {
-        global $frm_vars;
-        if ( isset($frm_vars['skip_shortcode']) && $frm_vars['skip_shortcode'] ) {
-            $sc = '[formidable';
+		global $frm_vars;
+		if ( isset($frm_vars['skip_shortcode']) && $frm_vars['skip_shortcode'] ) {
+			$sc = '[formidable';
 			if ( ! empty( $atts ) ) {
 				foreach ( $atts as $k => $v ) {
 					$sc .= ' ' . $k . '="' . esc_attr( $v ) . '"';
 				}
 			}
 			return $sc . ']';
-        }
-
-        $shortcode_atts = shortcode_atts( array(
-            'id' => '', 'key' => '', 'title' => false, 'description' => false,
-            'readonly' => false, 'entry_id' => false, 'fields' => array(),
-            'exclude_fields' => array(), 'minimize' => false,
-        ), $atts);
-        do_action('formidable_shortcode_atts', $shortcode_atts, $atts);
-
-        return self::show_form(
-            $shortcode_atts['id'], $shortcode_atts['key'], $shortcode_atts['title'],
-            $shortcode_atts['description'], $atts
-        );
-    }
-
-    public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
-        if ( empty( $id ) ) {
-            $id = $key;
-        }
-
-        // no form id or key set
-        if ( empty( $id ) ) {
-            return __( 'Please select a valid form', 'formidable' );
-        }
-
-        $form = FrmForm::getOne( $id );
-        if ( ! $form || $form->parent_form_id ) {
-            return __( 'Please select a valid form', 'formidable' );
-        }
+		}
+
+		$shortcode_atts = shortcode_atts( array(
+			'id' => '', 'key' => '', 'title' => false, 'description' => false,
+			'readonly' => false, 'entry_id' => false, 'fields' => array(),
+			'exclude_fields' => array(), 'minimize' => false,
+		), $atts);
+		do_action('formidable_shortcode_atts', $shortcode_atts, $atts);
+
+		return self::show_form(
+			$shortcode_atts['id'], $shortcode_atts['key'], $shortcode_atts['title'],
+			$shortcode_atts['description'], $atts
+		);
+	}
+
+	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
+		if ( empty( $id ) ) {
+			$id = $key;
+		}
+
+		// no form id or key set
+		if ( empty( $id ) ) {
+			return __( 'Please select a valid form', 'formidable' );
+		}
+
+		$form = FrmForm::getOne( $id );
+		if ( ! $form || $form->parent_form_id ) {
+			return __( 'Please select a valid form', 'formidable' );
+		}
 
 		add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
-        FrmAppHelper::trigger_hook_load( 'form', $form );
+		FrmAppHelper::trigger_hook_load( 'form', $form );
 
-        $form = apply_filters( 'frm_pre_display_form', $form );
+		$form = apply_filters( 'frm_pre_display_form', $form );
 
-        $frm_settings = FrmAppHelper::get_settings();
+		$frm_settings = FrmAppHelper::get_settings();
 
 		if ( self::is_viewable_draft_form( $form ) ) {
 			// don't show a draft form on a page
@@ -1080,7 +1080,7 @@ 
 		}
 
 		return $form;
-    }
+	}
 
 	private static function is_viewable_draft_form( $form ) {
 		global $post;
@@ -1096,98 +1096,98 @@ 
 		return $form->logged_in && get_current_user_id() && isset( $form->options['logged_in_role'] ) && $form->options['logged_in_role'] != '' && ! FrmAppHelper::user_has_permission( $form->options['logged_in_role'] );
 	}
 
-    public static function get_form( $form, $title, $description, $atts = array() ) {
-        ob_start();
+	public static function get_form( $form, $title, $description, $atts = array() ) {
+		ob_start();
 
-        self::get_form_contents( $form, $title, $description, $atts );
+		self::get_form_contents( $form, $title, $description, $atts );
 		self::enqueue_scripts( FrmForm::get_params( $form ) );
 
-        $contents = ob_get_contents();
-        ob_end_clean();
+		$contents = ob_get_contents();
+		ob_end_clean();
 
 		self::maybe_minimize_form( $atts, $contents );
 
-        return $contents;
-    }
+		return $contents;
+	}
 
 	public static function enqueue_scripts( $params ) {
 		do_action( 'frm_enqueue_form_scripts', $params );
 	}
 
 	public static function get_form_contents( $form, $title, $description, $atts ) {
-        global $frm_vars;
+		global $frm_vars;
 
-        $frm_settings = FrmAppHelper::get_settings();
+		$frm_settings = FrmAppHelper::get_settings();
 
-        $submit = isset($form->options['submit_value']) ? $form->options['submit_value'] : $frm_settings->submit_value;
+		$submit = isset($form->options['submit_value']) ? $form->options['submit_value'] : $frm_settings->submit_value;
 
-        $user_ID = get_current_user_id();
+		$user_ID = get_current_user_id();
 		$params = FrmForm::get_params( $form );
-        $message = $errors = '';
+		$message = $errors = '';
 
-        if ( $params['posted_form_id'] == $form->id && $_POST ) {
-            $errors = isset( $frm_vars['created_entries'][ $form->id ] ) ? $frm_vars['created_entries'][ $form->id ]['errors'] : array();
-        }
+		if ( $params['posted_form_id'] == $form->id && $_POST ) {
+			$errors = isset( $frm_vars['created_entries'][ $form->id ] ) ? $frm_vars['created_entries'][ $form->id ]['errors'] : array();
+		}
 
 		$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
-        $fields = FrmFieldsHelper::get_form_fields( $form->id, ( isset( $errors ) && ! empty( $errors ) ) );
+		$fields = FrmFieldsHelper::get_form_fields( $form->id, ( isset( $errors ) && ! empty( $errors ) ) );
 
-        if ( $params['action'] != 'create' || $params['posted_form_id'] != $form->id || ! $_POST ) {
-            do_action('frm_display_form_action', $params, $fields, $form, $title, $description);
-            if ( apply_filters('frm_continue_to_new', true, $form->id, $params['action']) ) {
-                $values = FrmEntriesHelper::setup_new_vars($fields, $form);
+		if ( $params['action'] != 'create' || $params['posted_form_id'] != $form->id || ! $_POST ) {
+			do_action('frm_display_form_action', $params, $fields, $form, $title, $description);
+			if ( apply_filters('frm_continue_to_new', true, $form->id, $params['action']) ) {
+				$values = FrmEntriesHelper::setup_new_vars($fields, $form);
 				include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
-            }
-            return;
-        }
+			}
+			return;
+		}
 
-        if ( ! empty($errors) ) {
-            $values = $fields ? FrmEntriesHelper::setup_new_vars($fields, $form) : array();
+		if ( ! empty($errors) ) {
+			$values = $fields ? FrmEntriesHelper::setup_new_vars($fields, $form) : array();
 			include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
-            return;
-        }
+			return;
+		}
 
-        do_action('frm_validate_form_creation', $params, $fields, $form, $title, $description);
-        if ( ! apply_filters('frm_continue_to_create', true, $form->id) ) {
-            return;
-        }
+		do_action('frm_validate_form_creation', $params, $fields, $form, $title, $description);
+		if ( ! apply_filters('frm_continue_to_create', true, $form->id) ) {
+			return;
+		}
 
-        $values = FrmEntriesHelper::setup_new_vars($fields, $form, true);
-        $created = ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form->id ] ) ) ? $frm_vars['created_entries'][ $form->id ]['entry_id'] : 0;
-        $conf_method = apply_filters('frm_success_filter', 'message', $form, $form->options, 'create');
+		$values = FrmEntriesHelper::setup_new_vars($fields, $form, true);
+		$created = ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form->id ] ) ) ? $frm_vars['created_entries'][ $form->id ]['entry_id'] : 0;
+		$conf_method = apply_filters('frm_success_filter', 'message', $form, $form->options, 'create');
 
-        if ( $created && is_numeric($created) && $conf_method != 'message' ) {
-            do_action('frm_success_action', $conf_method, $form, $form->options, $created);
+		if ( $created && is_numeric($created) && $conf_method != 'message' ) {
+			do_action('frm_success_action', $conf_method, $form, $form->options, $created);
 			do_action( 'frm_after_entry_processed', array( 'entry_id' => $created, 'form' => $form ) );
-            return;
-        }
+			return;
+		}
 
-        if ( $created && is_numeric($created) ) {
-            $message = isset($form->options['success_msg']) ? $form->options['success_msg'] : $frm_settings->success_msg;
-            $class = 'frm_message';
-        } else {
-            $message = $frm_settings->failed_msg;
-            $class = 'frm_error_style';
-        }
+		if ( $created && is_numeric($created) ) {
+			$message = isset($form->options['success_msg']) ? $form->options['success_msg'] : $frm_settings->success_msg;
+			$class = 'frm_message';
+		} else {
+			$message = $frm_settings->failed_msg;
+			$class = 'frm_error_style';
+		}
 
 		$message = FrmFormsHelper::get_success_message( array(
 			'message' => $message, 'form' => $form,
 			'entry_id' => $created, 'class' => $class,
 		) );
-        $message = apply_filters('frm_main_feedback', $message, $form, $created);
+		$message = apply_filters('frm_main_feedback', $message, $form, $created);
 
-        if ( ! isset($form->options['show_form']) || $form->options['show_form'] ) {
+		if ( ! isset($form->options['show_form']) || $form->options['show_form'] ) {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
-        } else {
-            global $frm_vars;
+		} else {
+			global $frm_vars;
 			self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
 
 			$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
 			include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php' );
-        }
+		}
 
 		do_action( 'frm_after_entry_processed', array( 'entry_id' => $created, 'form' => $form ) );
-    }
+	}
 
 	public static function front_head() {
 		$version = FrmAppHelper::plugin_version();
@@ -1216,10 +1216,10 @@ 
 	}
 
 	public static function defer_script_loading( $tag, $handle ) {
-	    if ( 'recaptcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
-	        $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
+		if ( 'recaptcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
+			$tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
 		}
-	    return $tag;
+		return $tag;
 	}
 
 	public static function footer_js( $location = 'footer' ) {

Spacing +121 added lines, -121 removed lines

@@ -7,7 +7,7 @@ 
 		if ( ! FrmAppHelper::pro_is_installed() ) {
 			$menu_label .= ' (Lite)';
 		}
-		add_submenu_page('formidable', 'Formidable | ' . $menu_label, $menu_label, 'frm_view_forms', 'formidable', 'FrmFormsController::route' );
+		add_submenu_page( 'formidable', 'Formidable | ' . $menu_label, $menu_label, 'frm_view_forms', 'formidable', 'FrmFormsController::route' );
 
 		self::maybe_load_listing_hooks();
     }
@@ -18,14 +18,14 @@ 
 			return;
 		}
 
-		add_filter('get_user_option_managetoplevel_page_formidablecolumnshidden', 'FrmFormsController::hidden_columns' );
+		add_filter( 'get_user_option_managetoplevel_page_formidablecolumnshidden', 'FrmFormsController::hidden_columns' );
 
-		add_filter('manage_toplevel_page_formidable_columns', 'FrmFormsController::get_columns', 0 );
-		add_filter('manage_toplevel_page_formidable_sortable_columns', 'FrmFormsController::get_sortable_columns' );
+		add_filter( 'manage_toplevel_page_formidable_columns', 'FrmFormsController::get_columns', 0 );
+		add_filter( 'manage_toplevel_page_formidable_sortable_columns', 'FrmFormsController::get_sortable_columns' );
 	}
 
     public static function head() {
-        wp_enqueue_script('formidable-editinplace');
+        wp_enqueue_script( 'formidable-editinplace' );
 
         if ( wp_is_mobile() ) {
     		wp_enqueue_script( 'jquery-touch-punch' );
@@ -33,39 +33,39 @@ 
     }
 
     public static function register_widgets() {
-        require_once(FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php');
-        register_widget('FrmShowForm');
+        require_once( FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php' );
+        register_widget( 'FrmShowForm' );
     }
 
     public static function list_form() {
-        FrmAppHelper::permission_check('frm_view_forms');
+        FrmAppHelper::permission_check( 'frm_view_forms' );
 
 		$params = FrmForm::list_page_params();
-        $errors = self::process_bulk_form_actions( array());
-        $errors = apply_filters('frm_admin_list_form_action', $errors);
+        $errors = self::process_bulk_form_actions( array() );
+        $errors = apply_filters( 'frm_admin_list_form_action', $errors );
 
 		return self::display_forms_list( $params, '', $errors );
     }
 
 	public static function new_form( $values = array() ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
         global $frm_vars;
 
-        $action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
-		$action = empty( $values ) ? FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' ) : $values[ $action ];
+        $action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
+		$action = empty( $values ) ? FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' ) : $values[$action];
 
 		if ( $action == 'create' ) {
-            return self::create($values);
+            return self::create( $values );
 		} else if ( $action == 'new' ) {
 			$frm_field_selection = FrmField::field_selection();
-            $values = FrmFormsHelper::setup_new_vars($values);
+            $values = FrmFormsHelper::setup_new_vars( $values );
             $id = FrmForm::create( $values );
-            $form = FrmForm::getOne($id);
+            $form = FrmForm::getOne( $id );
 
             // add default email notification
             $action_control = FrmFormActionsController::get_form_actions( 'email' );
-            $action_control->create($form->id);
+            $action_control->create( $form->id );
 
 			$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
@@ -75,7 +75,7 @@ 
     }
 
 	public static function create( $values = array() ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
         global $frm_vars;
         if ( empty( $values ) ) {
@@ -87,22 +87,22 @@ 
             $values = FrmProEntry::mod_other_vals( $values, 'back' );
         }
 
-		$id = isset($values['id']) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
+		$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
 
         if ( ! current_user_can( 'frm_edit_forms' ) || ( $_POST && ( ! isset( $values['frm_save_form'] ) || ! wp_verify_nonce( $values['frm_save_form'], 'frm_save_form_nonce' ) ) ) ) {
             $frm_settings = FrmAppHelper::get_settings();
             $errors = array( 'form' => $frm_settings->admin_permission );
         } else {
-            $errors = FrmForm::validate($values);
+            $errors = FrmForm::validate( $values );
         }
 
-        if ( count($errors) > 0 ) {
+        if ( count( $errors ) > 0 ) {
             $hide_preview = true;
 			$frm_field_selection = FrmField::field_selection();
             $form = FrmForm::getOne( $id );
-            $fields = FrmField::get_all_for_form($id);
+            $fields = FrmField::get_all_for_form( $id );
 
-            $values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
+            $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
 			$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
@@ -114,32 +114,32 @@ 
     }
 
     public static function edit( $values = false ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
 		$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
-        return self::get_edit_vars($id);
+        return self::get_edit_vars( $id );
     }
 
     public static function settings( $id = false, $message = '' ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
-        if ( ! $id || ! is_numeric($id) ) {
+        if ( ! $id || ! is_numeric( $id ) ) {
 			$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
         }
 		return self::get_settings_vars( $id, array(), $message );
     }
 
     public static function update_settings() {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
 		$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
 
-        $errors = FrmForm::validate($_POST);
-        if ( count($errors) > 0 ) {
-            return self::get_settings_vars($id, $errors);
+        $errors = FrmForm::validate( $_POST );
+        if ( count( $errors ) > 0 ) {
+            return self::get_settings_vars( $id, $errors );
         }
 
-        do_action('frm_before_update_form_settings', $id);
+        do_action( 'frm_before_update_form_settings', $id );
 
 		FrmForm::update( $id, $_POST );
 
@@ -161,7 +161,7 @@ 
 
 	private static function edit_in_place_value( $field ) {
 		check_ajax_referer( 'frm_ajax', 'nonce' );
-		FrmAppHelper::permission_check('frm_edit_forms', 'hide');
+		FrmAppHelper::permission_check( 'frm_edit_forms', 'hide' );
 
 		$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
 		$value = FrmAppHelper::get_post_param( 'update_value', '', 'wp_filter_post_kses' );
@@ -219,7 +219,7 @@ 
 	 * @since 2.0
 	 */
 	public static function _create_from_template() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
 		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$current_form = FrmAppHelper::get_param( 'this_form', '', 'get', 'absint' );
@@ -234,15 +234,15 @@ 
 	}
 
     public static function duplicate() {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
 		$params = FrmForm::list_page_params();
         $form = FrmForm::duplicate( $params['id'], $params['template'], true );
-        $message = ($params['template']) ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' );
+        $message = ( $params['template'] ) ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' );
         if ( $form ) {
 			return self::get_edit_vars( $form, array(), $message, true );
         } else {
-            return self::display_forms_list($params, __( 'There was a problem creating the new template.', 'formidable' ));
+            return self::display_forms_list( $params, __( 'There was a problem creating the new template.', 'formidable' ) );
         }
     }
 
@@ -304,11 +304,11 @@ 
     }
 
 	public static function bulk_untrash( $ids ) {
-        FrmAppHelper::permission_check('frm_edit_forms');
+        FrmAppHelper::permission_check( 'frm_edit_forms' );
 
         $count = FrmForm::set_status( $ids, 'published' );
 
-        $message = sprintf(_n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
+        $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
         return $message;
     }
 
@@ -327,11 +327,11 @@ 
 			'trash'   => array( 'permission' => 'frm_delete_forms', 'new_status' => 'trash' ),
 		);
 
-		if ( ! isset( $available_status[ $status ] ) ) {
+		if ( ! isset( $available_status[$status] ) ) {
 			return;
 		}
 
-		FrmAppHelper::permission_check( $available_status[ $status ]['permission'] );
+		FrmAppHelper::permission_check( $available_status[$status]['permission'] );
 
 		$params = FrmForm::list_page_params();
 
@@ -339,25 +339,25 @@ 
 		check_admin_referer( $status . '_form_' . $params['id'] );
 
 		$count = 0;
-		if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
-			$count++;
+		if ( FrmForm::set_status( $params['id'], $available_status[$status]['new_status'] ) ) {
+			$count ++;
 		}
 
-		$available_status['untrash']['message'] = sprintf(_n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
+		$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
 		$available_status['trash']['message'] = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . ( isset( $_REQUEST['form_type'] ) ? sanitize_title( $_REQUEST['form_type'] ) : '' ) . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' );
 
-		$message = $available_status[ $status ]['message'];
+		$message = $available_status[$status]['message'];
 
 		self::display_forms_list( $params, $message );
 	}
 
 	public static function bulk_trash( $ids ) {
-        FrmAppHelper::permission_check('frm_delete_forms');
+        FrmAppHelper::permission_check( 'frm_delete_forms' );
 
         $count = 0;
         foreach ( $ids as $id ) {
             if ( FrmForm::trash( $id ) ) {
-                $count++;
+                $count ++;
             }
         }
 
@@ -368,49 +368,49 @@ 
     }
 
     public static function destroy() {
-        FrmAppHelper::permission_check('frm_delete_forms');
+        FrmAppHelper::permission_check( 'frm_delete_forms' );
 
 		$params = FrmForm::list_page_params();
 
         //check nonce url
-        check_admin_referer('destroy_form_' . $params['id']);
+        check_admin_referer( 'destroy_form_' . $params['id'] );
 
         $count = 0;
         if ( FrmForm::destroy( $params['id'] ) ) {
-            $count++;
+            $count ++;
         }
 
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+        $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
 
 		self::display_forms_list( $params, $message );
     }
 
 	public static function bulk_destroy( $ids ) {
-        FrmAppHelper::permission_check('frm_delete_forms');
+        FrmAppHelper::permission_check( 'frm_delete_forms' );
 
         $count = 0;
         foreach ( $ids as $id ) {
             $d = FrmForm::destroy( $id );
             if ( $d ) {
-                $count++;
+                $count ++;
             }
         }
 
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+        $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
 
         return $message;
     }
 
     private static function delete_all() {
         //check nonce url
-        $permission_error = FrmAppHelper::permission_nonce_error('frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable');
+        $permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
         if ( $permission_error !== false ) {
 			self::display_forms_list( array(), '', array( $permission_error ) );
             return;
         }
 
 		$count = FrmForm::scheduled_delete( time() );
-        $message = sprintf(_n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count);
+        $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
 
 		self::display_forms_list( array(), $message );
     }
@@ -427,7 +427,7 @@ 
 	* @since 2.0.15
 	*/
 	public static function insert_form_button() {
-		if ( current_user_can('frm_view_forms') ) {
+		if ( current_user_can( 'frm_view_forms' ) ) {
 			$menu_name = FrmAppHelper::get_menu_name();
 			$content = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">
 				<span class="frm-buttons-icon wp-media-buttons-icon"></span> ' .
@@ -448,17 +448,17 @@ 
 			'formidable' => array( 'name' => __( 'Form', 'formidable' ), 'label' => __( 'Insert a Form', 'formidable' ) ),
         );
 
-        $shortcodes = apply_filters('frm_popup_shortcodes', $shortcodes);
+        $shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php' );
     }
 
     public static function get_shortcode_opts() {
-		FrmAppHelper::permission_check('frm_view_forms');
+		FrmAppHelper::permission_check( 'frm_view_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
-        if ( empty($shortcode) ) {
+        if ( empty( $shortcode ) ) {
             wp_die();
         }
 
@@ -478,7 +478,7 @@ 
                 );
             break;
         }
-        $opts = apply_filters('frm_sc_popup_opts', $opts, $shortcode);
+        $opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
 
 		if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
 			// allow other shortcodes to use the required form id option
@@ -595,11 +595,11 @@ 
         }
 
         if ( $form->parent_form_id ) {
-			wp_die( sprintf( __( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form->parent_form_id ) ) . '">', '</a>' ));
+			wp_die( sprintf( __( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form->parent_form_id ) ) . '">', '</a>' ) );
         }
 
 		$frm_field_selection = FrmField::field_selection();
-        $fields = FrmField::get_all_for_form($form->id);
+        $fields = FrmField::get_all_for_form( $form->id );
 
         // Automatically add end section fields if they don't exist (2.0 migration)
         $reset_fields = false;
@@ -609,9 +609,9 @@ 
             $fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
         }
 
-        unset($end_section_values, $last_order, $open, $reset_fields);
+        unset( $end_section_values, $last_order, $open, $reset_fields );
 
-        $values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
+        $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
 
         $edit_message = __( 'Form was Successfully Updated', 'formidable' );
         if ( $form->is_template && $message == $edit_message ) {
@@ -621,8 +621,8 @@ 
 		$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
 
         if ( $form->default_template ) {
-            wp_die(__( 'That template cannot be edited', 'formidable' ));
-        } else if ( defined('DOING_AJAX') ) {
+            wp_die( __( 'That template cannot be edited', 'formidable' ) );
+        } else if ( defined( 'DOING_AJAX' ) ) {
             wp_die();
         } else if ( $create_link ) {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
@@ -638,28 +638,28 @@ 
 
         $form = FrmForm::getOne( $id );
 
-        $fields = FrmField::get_all_for_form($id);
-        $values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
+        $fields = FrmField::get_all_for_form( $id );
+        $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
 
-        if ( isset($values['default_template']) && $values['default_template'] ) {
-            wp_die(__( 'That template cannot be edited', 'formidable' ));
+        if ( isset( $values['default_template'] ) && $values['default_template'] ) {
+            wp_die( __( 'That template cannot be edited', 'formidable' ) );
         }
 
         $action_controls = FrmFormActionsController::get_form_actions();
 
-        $sections = apply_filters('frm_add_form_settings_section', array(), $values);
+        $sections = apply_filters( 'frm_add_form_settings_section', array(), $values );
         $pro_feature = FrmAppHelper::pro_is_installed() ? '' : ' class="pro_feature"';
 
-        $styles = apply_filters('frm_get_style_opts', array());
+        $styles = apply_filters( 'frm_get_style_opts', array() );
 
 		require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
     }
 
     public static function mb_tags_box( $form_id, $class = '' ) {
-        $fields = FrmField::get_all_for_form($form_id, '', 'include');
+        $fields = FrmField::get_all_for_form( $form_id, '', 'include' );
         $linked_forms = array();
         $col = 'one';
-        $settings_tab = FrmAppHelper::is_admin_page('formidable' ) ? true : false;
+        $settings_tab = FrmAppHelper::is_admin_page( 'formidable' ) ? true : false;
 
 		$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
 		$adv_shortcodes = self::get_advanced_shortcodes();
@@ -737,13 +737,13 @@ 
 
     // Insert the form class setting into the form
 	public static function form_classes( $form ) {
-        if ( isset($form->options['form_class']) ) {
+        if ( isset( $form->options['form_class'] ) ) {
 			echo esc_attr( sanitize_text_field( $form->options['form_class'] ) );
         }
     }
 
     public static function get_email_html() {
-		FrmAppHelper::permission_check('frm_view_forms');
+		FrmAppHelper::permission_check( 'frm_view_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 		echo FrmEntryFormat::show_entry( array(
 			'form_id'       => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
@@ -840,11 +840,11 @@ 
     public static function add_default_templates( $path, $default = true, $template = true ) {
         _deprecated_function( __FUNCTION__, '1.07.05', 'FrmXMLController::add_default_templates()' );
 
-        $path = untrailingslashit(trim($path));
+        $path = untrailingslashit( trim( $path ) );
 		$templates = glob( $path . '/*.php' );
 
-		for ( $i = count( $templates ) - 1; $i >= 0; $i-- ) {
-			$filename = str_replace( '.php', '', str_replace( $path . '/', '', $templates[ $i ] ) );
+		for ( $i = count( $templates ) - 1; $i >= 0; $i -- ) {
+			$filename = str_replace( '.php', '', str_replace( $path . '/', '', $templates[$i] ) );
 			$template_query = array( 'form_key' => $filename );
             if ( $template ) {
                 $template_query['is_template'] = 1;
@@ -862,12 +862,12 @@ 
                 $values['default_template'] = 1;
             }
 
-            include( $templates[ $i ] );
+            include( $templates[$i] );
 
             //get updated form
-            if ( isset($form) && ! empty($form) ) {
+            if ( isset( $form ) && ! empty( $form ) ) {
                 $old_id = $form->id;
-                $form = FrmForm::getOne($form->id);
+                $form = FrmForm::getOne( $form->id );
             } else {
                 $old_id = false;
 				$form = FrmForm::getAll( $template_query, '', 1 );
@@ -880,24 +880,24 @@ 
     }
 
     public static function route() {
-        $action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
+        $action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
         $vars = array();
 		if ( isset( $_POST['frm_compact_fields'] ) ) {
 			FrmAppHelper::permission_check( 'frm_edit_forms' );
 
-            $json_vars = htmlspecialchars_decode(nl2br(stripslashes(str_replace('&quot;', '\\\"', $_POST['frm_compact_fields'] ))));
-            $json_vars = json_decode($json_vars, true);
-            if ( empty($json_vars) ) {
+            $json_vars = htmlspecialchars_decode( nl2br( stripslashes( str_replace( '&quot;', '\\\"', $_POST['frm_compact_fields'] ) ) ) );
+            $json_vars = json_decode( $json_vars, true );
+            if ( empty( $json_vars ) ) {
                 // json decoding failed so we should return an error message
 				$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
                 if ( 'edit' == $action ) {
                     $action = 'update';
                 }
 
-                add_filter('frm_validate_form', 'FrmFormsController::json_error');
+                add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
             } else {
-                $vars = FrmAppHelper::json_to_array($json_vars);
-                $action = $vars[ $action ];
+                $vars = FrmAppHelper::json_to_array( $json_vars );
+                $action = $vars[$action];
 				unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] );
 				$_REQUEST = array_merge( $_REQUEST, $vars );
 				$_POST = array_merge( $_POST, $_REQUEST );
@@ -915,7 +915,7 @@ 
 
         switch ( $action ) {
             case 'new':
-                return self::new_form($vars);
+                return self::new_form( $vars );
             case 'create':
             case 'edit':
             case 'update':
@@ -938,7 +938,7 @@ 
 					$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
                 }
 
-                if ( strpos($action, 'bulk_') === 0 ) {
+                if ( strpos( $action, 'bulk_' ) === 0 ) {
                     FrmAppHelper::remove_get_action();
                     return self::list_form();
                 }
@@ -965,27 +965,27 @@ 
 
 	public static function admin_bar_configure() {
         global $frm_vars;
-        if ( empty($frm_vars['forms_loaded']) ) {
+        if ( empty( $frm_vars['forms_loaded'] ) ) {
             return;
         }
 
         $actions = array();
         foreach ( $frm_vars['forms_loaded'] as $form ) {
-            if ( is_object($form) ) {
-                $actions[ $form->id ] = $form->name;
+            if ( is_object( $form ) ) {
+                $actions[$form->id] = $form->name;
             }
-            unset($form);
+            unset( $form );
         }
 
-        if ( empty($actions) ) {
+        if ( empty( $actions ) ) {
             return;
         }
 
-        asort($actions);
+        asort( $actions );
 
         global $wp_admin_bar;
 
-        if ( count($actions) == 1 ) {
+        if ( count( $actions ) == 1 ) {
             $wp_admin_bar->add_menu( array(
                 'title' => 'Edit Form',
 				'href'  => admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . current( array_keys( $actions ) ) ),
@@ -1006,7 +1006,7 @@ 
         		$wp_admin_bar->add_menu( array(
         			'parent'    => 'frm-forms',
 					'id'        => 'edit_form_' . $form_id,
-        			'title'     => empty($name) ? __( '(no title)') : $name,
+        			'title'     => empty( $name ) ? __( '(no title)' ) : $name,
 					'href'      => admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form_id ),
         		) );
         	}
@@ -1016,7 +1016,7 @@ 
     //formidable shortcode
 	public static function get_form_shortcode( $atts ) {
         global $frm_vars;
-        if ( isset($frm_vars['skip_shortcode']) && $frm_vars['skip_shortcode'] ) {
+        if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) {
             $sc = '[formidable';
 			if ( ! empty( $atts ) ) {
 				foreach ( $atts as $k => $v ) {
@@ -1030,8 +1030,8 @@ 
             'id' => '', 'key' => '', 'title' => false, 'description' => false,
             'readonly' => false, 'entry_id' => false, 'fields' => array(),
             'exclude_fields' => array(), 'minimize' => false,
-        ), $atts);
-        do_action('formidable_shortcode_atts', $shortcode_atts, $atts);
+        ), $atts );
+        do_action( 'formidable_shortcode_atts', $shortcode_atts, $atts );
 
         return self::show_form(
             $shortcode_atts['id'], $shortcode_atts['key'], $shortcode_atts['title'],
@@ -1119,51 +1119,51 @@ 
 
         $frm_settings = FrmAppHelper::get_settings();
 
-        $submit = isset($form->options['submit_value']) ? $form->options['submit_value'] : $frm_settings->submit_value;
+        $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
 
         $user_ID = get_current_user_id();
 		$params = FrmForm::get_params( $form );
         $message = $errors = '';
 
         if ( $params['posted_form_id'] == $form->id && $_POST ) {
-            $errors = isset( $frm_vars['created_entries'][ $form->id ] ) ? $frm_vars['created_entries'][ $form->id ]['errors'] : array();
+            $errors = isset( $frm_vars['created_entries'][$form->id] ) ? $frm_vars['created_entries'][$form->id]['errors'] : array();
         }
 
 		$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
         $fields = FrmFieldsHelper::get_form_fields( $form->id, ( isset( $errors ) && ! empty( $errors ) ) );
 
         if ( $params['action'] != 'create' || $params['posted_form_id'] != $form->id || ! $_POST ) {
-            do_action('frm_display_form_action', $params, $fields, $form, $title, $description);
-            if ( apply_filters('frm_continue_to_new', true, $form->id, $params['action']) ) {
-                $values = FrmEntriesHelper::setup_new_vars($fields, $form);
+            do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
+            if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
+                $values = FrmEntriesHelper::setup_new_vars( $fields, $form );
 				include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
             }
             return;
         }
 
-        if ( ! empty($errors) ) {
-            $values = $fields ? FrmEntriesHelper::setup_new_vars($fields, $form) : array();
+        if ( ! empty( $errors ) ) {
+            $values = $fields ? FrmEntriesHelper::setup_new_vars( $fields, $form ) : array();
 			include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
             return;
         }
 
-        do_action('frm_validate_form_creation', $params, $fields, $form, $title, $description);
-        if ( ! apply_filters('frm_continue_to_create', true, $form->id) ) {
+        do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
+        if ( ! apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
             return;
         }
 
-        $values = FrmEntriesHelper::setup_new_vars($fields, $form, true);
-        $created = ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form->id ] ) ) ? $frm_vars['created_entries'][ $form->id ]['entry_id'] : 0;
-        $conf_method = apply_filters('frm_success_filter', 'message', $form, $form->options, 'create');
+        $values = FrmEntriesHelper::setup_new_vars( $fields, $form, true );
+        $created = ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][$form->id] ) ) ? $frm_vars['created_entries'][$form->id]['entry_id'] : 0;
+        $conf_method = apply_filters( 'frm_success_filter', 'message', $form, $form->options, 'create' );
 
-        if ( $created && is_numeric($created) && $conf_method != 'message' ) {
-            do_action('frm_success_action', $conf_method, $form, $form->options, $created);
+        if ( $created && is_numeric( $created ) && $conf_method != 'message' ) {
+            do_action( 'frm_success_action', $conf_method, $form, $form->options, $created );
 			do_action( 'frm_after_entry_processed', array( 'entry_id' => $created, 'form' => $form ) );
             return;
         }
 
-        if ( $created && is_numeric($created) ) {
-            $message = isset($form->options['success_msg']) ? $form->options['success_msg'] : $frm_settings->success_msg;
+        if ( $created && is_numeric( $created ) ) {
+            $message = isset( $form->options['success_msg'] ) ? $form->options['success_msg'] : $frm_settings->success_msg;
             $class = 'frm_message';
         } else {
             $message = $frm_settings->failed_msg;
@@ -1174,9 +1174,9 @@ 
 			'message' => $message, 'form' => $form,
 			'entry_id' => $created, 'class' => $class,
 		) );
-        $message = apply_filters('frm_main_feedback', $message, $form, $created);
+        $message = apply_filters( 'frm_main_feedback', $message, $form, $created );
 
-        if ( ! isset($form->options['show_form']) || $form->options['show_form'] ) {
+        if ( ! isset( $form->options['show_form'] ) || $form->options['show_form'] ) {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
         } else {
             global $frm_vars;

classes/controllers/FrmFieldsController.php

Indentation +438 added lines, -438 removed lines

@@ -2,137 +2,137 @@ 
 
 class FrmFieldsController {
 
-    public static function load_field() {
+	public static function load_field() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        $fields = $_POST['field'];
-        if ( empty( $fields ) ) {
-            wp_die();
-        }
+		$fields = $_POST['field'];
+		if ( empty( $fields ) ) {
+			wp_die();
+		}
 
-        $_GET['page'] = 'formidable';
-        $fields = stripslashes_deep( $fields );
+		$_GET['page'] = 'formidable';
+		$fields = stripslashes_deep( $fields );
 
-        $ajax = true;
+		$ajax = true;
 		$values = array( 'id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ) );
-        $path = FrmAppHelper::plugin_path();
-        $field_html = array();
-
-        foreach ( $fields as $field ) {
-            $field = htmlspecialchars_decode( nl2br( $field ) );
-            $field = json_decode( $field, true );
-            if ( ! isset( $field['id'] ) ) {
-                // this field may have already been loaded
-                continue;
-            }
+		$path = FrmAppHelper::plugin_path();
+		$field_html = array();
+
+		foreach ( $fields as $field ) {
+			$field = htmlspecialchars_decode( nl2br( $field ) );
+			$field = json_decode( $field, true );
+			if ( ! isset( $field['id'] ) ) {
+				// this field may have already been loaded
+				continue;
+			}
 
-            $field_id = absint( $field['id'] );
+			$field_id = absint( $field['id'] );
 
-            if ( ! isset( $field['value'] ) ) {
-                $field['value'] = '';
-            }
+			if ( ! isset( $field['value'] ) ) {
+				$field['value'] = '';
+			}
 
 			$field_name = 'item_meta['. $field_id .']';
-            $html_id = FrmFieldsHelper::get_html_id($field);
+			$html_id = FrmFieldsHelper::get_html_id($field);
 
-            ob_start();
+			ob_start();
 			include( $path . '/classes/views/frm-forms/add_field.php' );
-            $field_html[ $field_id ] = ob_get_contents();
-            ob_end_clean();
-        }
+			$field_html[ $field_id ] = ob_get_contents();
+			ob_end_clean();
+		}
 
-        unset($path);
+		unset($path);
 
-        echo json_encode($field_html);
+		echo json_encode($field_html);
 
-        wp_die();
-    }
+		wp_die();
+	}
 
-    public static function create() {
+	public static function create() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_type = FrmAppHelper::get_post_param( 'field', '', 'sanitize_text_field' );
 		$form_id = FrmAppHelper::get_post_param( 'form_id', 0, 'absint' );
 
-        $field = self::include_new_field($field_type, $form_id);
+		$field = self::include_new_field($field_type, $form_id);
 
-        // this hook will allow for multiple fields to be added at once
-        do_action('frm_after_field_created', $field, $form_id);
+		// this hook will allow for multiple fields to be added at once
+		do_action('frm_after_field_created', $field, $form_id);
 
-        wp_die();
-    }
+		wp_die();
+	}
 
-    /**
-     * @param integer $form_id
-     */
+	/**
+	 * @param integer $form_id
+	 */
 	public static function include_new_field( $field_type, $form_id ) {
-        $values = array();
-        if ( FrmAppHelper::pro_is_installed() ) {
-            $values['post_type'] = FrmProFormsHelper::post_type($form_id);
-        }
+		$values = array();
+		if ( FrmAppHelper::pro_is_installed() ) {
+			$values['post_type'] = FrmProFormsHelper::post_type($form_id);
+		}
 
-        $field_values = apply_filters('frm_before_field_created', FrmFieldsHelper::setup_new_vars($field_type, $form_id));
-        $field_id = FrmField::create( $field_values );
+		$field_values = apply_filters('frm_before_field_created', FrmFieldsHelper::setup_new_vars($field_type, $form_id));
+		$field_id = FrmField::create( $field_values );
 
-        if ( ! $field_id ) {
-            return false;
-        }
+		if ( ! $field_id ) {
+			return false;
+		}
 
-        $field = self::include_single_field($field_id, $values, $form_id);
+		$field = self::include_single_field($field_id, $values, $form_id);
 
-        return $field;
-    }
+		return $field;
+	}
 
-    public static function update_form_id() {
+	public static function update_form_id() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_id = FrmAppHelper::get_post_param( 'field', 0, 'absint' );
 		$form_id = FrmAppHelper::get_post_param( 'form_id', 0, 'absint' );
 
-        if ( ! $field_id || ! $form_id ) {
-            wp_die();
-        }
+		if ( ! $field_id || ! $form_id ) {
+			wp_die();
+		}
 
 		$updated = FrmField::update( $field_id, compact( 'form_id' ) );
 		echo absint( $updated );
 
-        wp_die();
-    }
+		wp_die();
+	}
 
 	public static function edit_name( $field = 'name', $id = '' ) {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        if ( empty($field) ) {
-            $field = 'name';
-        }
+		if ( empty($field) ) {
+			$field = 'name';
+		}
 
-        if ( empty($id) ) {
+		if ( empty($id) ) {
 			$id = FrmAppHelper::get_post_param( 'element_id', '', 'sanitize_title' );
 			$id = str_replace( 'field_label_', '', $id );
-        }
+		}
 
 		$value = FrmAppHelper::get_post_param( 'update_value', '', 'wp_kses_post' );
 		$value = trim( $value );
-        if ( trim(strip_tags($value)) == '' ) {
-            // set blank value if there is no content
-            $value = '';
-        }
+		if ( trim(strip_tags($value)) == '' ) {
+			// set blank value if there is no content
+			$value = '';
+		}
 
 		FrmField::update( $id, array( $field => $value ) );
 
 		do_action( 'frm_after_update_field_' . $field, compact( 'id', 'value' ) );
 
 		echo stripslashes( wp_kses_post( $value ) );
-        wp_die();
-    }
+		wp_die();
+	}
 
-    public static function update_ajax_option() {
+	public static function update_ajax_option() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_id = FrmAppHelper::get_post_param( 'field', 0, 'absint' );
 		if ( ! $field_id ) {
@@ -147,141 +147,141 @@ 
 			unset($new_val);
 		}
 
-        FrmField::update( $field_id, array(
-            'field_options' => $field->field_options,
+		FrmField::update( $field_id, array(
+			'field_options' => $field->field_options,
 			'form_id'		=> $field->form_id,
-        ) );
-        wp_die();
-    }
+		) );
+		wp_die();
+	}
 
-    public static function duplicate() {
+	public static function duplicate() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        global $wpdb;
+		global $wpdb;
 
 		$field_id = FrmAppHelper::get_post_param( 'field_id', 0, 'absint' );
 		$form_id = FrmAppHelper::get_post_param( 'form_id', 0, 'absint' );
 
 		$copy_field = FrmField::getOne( $field_id );
-        if ( ! $copy_field ) {
-            wp_die();
-        }
+		if ( ! $copy_field ) {
+			wp_die();
+		}
 
 		do_action( 'frm_duplicate_field', $copy_field, $form_id );
 		do_action( 'frm_duplicate_field_' . $copy_field->type, $copy_field, $form_id );
 
-        $values = array( 'id' => $form_id );
-        FrmFieldsHelper::fill_field( $values, $copy_field, $form_id );
+		$values = array( 'id' => $form_id );
+		FrmFieldsHelper::fill_field( $values, $copy_field, $form_id );
 
 		$field_count = FrmDb::get_count( $wpdb->prefix . 'frm_fields fi LEFT JOIN ' . $wpdb->prefix . 'frm_forms fr ON (fi.form_id = fr.id)', array( 'or' => 1, 'fr.id' => $form_id, 'fr.parent_form_id' => $form_id ) );
 
-        $values['field_order'] = $field_count + 1;
+		$values['field_order'] = $field_count + 1;
 
-        if ( ! $field_id = FrmField::create($values) ) {
-            wp_die();
-        }
+		if ( ! $field_id = FrmField::create($values) ) {
+			wp_die();
+		}
 
-        self::include_single_field($field_id, $values);
+		self::include_single_field($field_id, $values);
 
-        wp_die();
-    }
+		wp_die();
+	}
 
-    /**
-     * Load a single field in the form builder along with all needed variables
-     */
-    public static function include_single_field( $field_id, $values, $form_id = 0 ) {
-        $field = FrmFieldsHelper::setup_edit_vars(FrmField::getOne($field_id));
+	/**
+	 * Load a single field in the form builder along with all needed variables
+	 */
+	public static function include_single_field( $field_id, $values, $form_id = 0 ) {
+		$field = FrmFieldsHelper::setup_edit_vars(FrmField::getOne($field_id));
 		$field_name = 'item_meta[' . $field_id . ']';
-        $html_id = FrmFieldsHelper::get_html_id($field);
-        $id = $form_id ? $form_id : $field['form_id'];
-        if ( $field['type'] == 'html' ) {
-            $field['stop_filter'] = true;
-        }
+		$html_id = FrmFieldsHelper::get_html_id($field);
+		$id = $form_id ? $form_id : $field['form_id'];
+		if ( $field['type'] == 'html' ) {
+			$field['stop_filter'] = true;
+		}
 
 		require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_field.php' );
 
-        return $field;
-    }
+		return $field;
+	}
 
-    public static function destroy() {
+	public static function destroy() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_id = FrmAppHelper::get_post_param( 'field_id', 0, 'absint' );
 		FrmField::destroy( $field_id );
-        wp_die();
-    }
+		wp_die();
+	}
 
-    /* Field Options */
+	/* Field Options */
 
-    //Add Single Option or Other Option
-    public static function add_option() {
+	//Add Single Option or Other Option
+	public static function add_option() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$id = FrmAppHelper::get_post_param( 'field_id', 0, 'absint' );
 		$opt_type = FrmAppHelper::get_post_param( 'opt_type', '', 'sanitize_text_field' );
 
-        //Get the field
-        $field = FrmField::getOne($id);
+		//Get the field
+		$field = FrmField::getOne($id);
 
 		if ( ! empty( $field->options ) ) {
 			$keys = array_keys( $field->options );
-            $last = str_replace( 'other_', '', end( $keys ) );
-        } else {
-            $last = 0;
-        }
-        $opt_key = $last + 1;
+			$last = str_replace( 'other_', '', end( $keys ) );
+		} else {
+			$last = 0;
+		}
+		$opt_key = $last + 1;
 
-        if ( 'other' == $opt_type ) {
+		if ( 'other' == $opt_type ) {
 			$opt = esc_html__( 'Other', 'formidable' );
-            $other_val = '';
-            $opt_key = 'other_' . $opt_key;
-
-            //Update value of "other" in DB
-            $field_options = maybe_unserialize( $field->field_options );
-            $field_options['other'] = 1;
-            FrmField::update( $id, array( 'field_options' => maybe_serialize( $field_options ) ) );
-        } else {
+			$other_val = '';
+			$opt_key = 'other_' . $opt_key;
+
+			//Update value of "other" in DB
+			$field_options = maybe_unserialize( $field->field_options );
+			$field_options['other'] = 1;
+			FrmField::update( $id, array( 'field_options' => maybe_serialize( $field_options ) ) );
+		} else {
 			$first_opt = reset( $field->options );
 			$next_opt = count( $field->options );
-            if ( $first_opt != '' ) {
-                $next_opt++;
-            }
+			if ( $first_opt != '' ) {
+				$next_opt++;
+			}
 			$opt = esc_html__( 'Option', 'formidable' ) . ' ' . $next_opt;
-            unset($next_opt);
-        }
-        $field_val = $opt;
+			unset($next_opt);
+		}
+		$field_val = $opt;
 		$field->options[ $opt_key ] = $opt;
 
-        //Update options in DB
+		//Update options in DB
 		FrmField::update( $id, array( 'options' => $field->options ) );
 
-        $field_data = $field;
-        $field = array(
-            'type'  => $field_data->type,
-            'id'    => $id,
-            'separate_value' => isset($field_data->field_options['separate_value']) ? $field_data->field_options['separate_value'] : 0,
-            'form_id' => $field_data->form_id,
-            'field_key' => $field_data->field_key,
-        );
+		$field_data = $field;
+		$field = array(
+			'type'  => $field_data->type,
+			'id'    => $id,
+			'separate_value' => isset($field_data->field_options['separate_value']) ? $field_data->field_options['separate_value'] : 0,
+			'form_id' => $field_data->form_id,
+			'field_key' => $field_data->field_key,
+		);
 
 		$field_name = 'item_meta[' . $id . ']';
-        $html_id = FrmFieldsHelper::get_html_id($field);
-        $checked = '';
+		$html_id = FrmFieldsHelper::get_html_id($field);
+		$checked = '';
 
-        if ( 'other' == $opt_type ) {
+		if ( 'other' == $opt_type ) {
 			require( FrmAppHelper::plugin_path() . '/pro/classes/views/frmpro-fields/other-option.php' );
-        } else {
+		} else {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/single-option.php' );
-        }
-        wp_die();
-    }
+		}
+		wp_die();
+	}
 
-    public static function edit_option() {
+	public static function edit_option() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$element_id = FrmAppHelper::get_post_param( 'element_id', '', 'sanitize_title' );
 		$ids = explode( '-', $element_id );
@@ -289,43 +289,43 @@ 
 
 		$orig_update_value = $update_value = trim( FrmAppHelper::get_post_param( 'update_value', '', 'wp_kses_post' ) );
 		if ( strpos( $element_id, 'key_' ) ) {
-            $new_value = $update_value;
-        } else {
-            $new_label = $update_value;
-        }
+			$new_value = $update_value;
+		} else {
+			$new_label = $update_value;
+		}
 
-        $field = FrmField::getOne($id);
-        $separate_values = FrmField::is_option_true( $field, 'separate_value' );
+		$field = FrmField::getOne($id);
+		$separate_values = FrmField::is_option_true( $field, 'separate_value' );
 
-        $this_opt_id = end($ids);
+		$this_opt_id = end($ids);
 		$this_opt = (array) $field->options[ $this_opt_id ];
 		$other_opt = ( $this_opt_id && strpos( $this_opt_id, 'other') !== false );
 
-        $label = isset($this_opt['label']) ? $this_opt['label'] : reset($this_opt);
-        $value = isset($this_opt['value']) ? $this_opt['value'] : '';
+		$label = isset($this_opt['label']) ? $this_opt['label'] : reset($this_opt);
+		$value = isset($this_opt['value']) ? $this_opt['value'] : '';
 
-        if ( ! isset( $new_label ) ) {
-            $new_label = $label;
-        }
+		if ( ! isset( $new_label ) ) {
+			$new_label = $label;
+		}
 
-        if ( isset($new_value) || isset($value) ) {
-            $update_value = isset($new_value) ? $new_value : $value;
-        }
+		if ( isset($new_value) || isset($value) ) {
+			$update_value = isset($new_value) ? $new_value : $value;
+		}
 
 		if ( $update_value != $new_label && $other_opt === false && $separate_values ) {
 			$field->options[ $this_opt_id ] = array( 'value' => $update_value, 'label' => $new_label );
-        } else {
+		} else {
 			$field->options[ $this_opt_id ] = $orig_update_value;
-        }
+		}
 
 		FrmField::update( $field->id, array( 'options' => $field->options ) );
 		echo ( $orig_update_value == '' ) ? esc_html__( '(Blank)', 'formidable' ) : stripslashes( $orig_update_value );
-        wp_die();
-    }
+		wp_die();
+	}
 
-    public static function delete_option() {
+	public static function delete_option() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_id = FrmAppHelper::get_post_param( 'field_id', 0, 'absint' );
 		$field = FrmField::getOne( $field_id );
@@ -333,310 +333,310 @@ 
 		$opt_key = FrmAppHelper::get_post_param( 'opt_key', 0, 'sanitize_title' );
 
 		$options = $field->options;
-        unset( $options[ $opt_key ] );
-        $response = array( 'other' => true );
+		unset( $options[ $opt_key ] );
+		$response = array( 'other' => true );
 
-        //If the deleted option is an "other" option
+		//If the deleted option is an "other" option
 		if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) {
-            //Assume all other options are gone, unless proven otherwise
-            $other = false;
+			//Assume all other options are gone, unless proven otherwise
+			$other = false;
 
-            //Check if all other options are really gone
-            foreach ( $options as $o_key => $o_val ) {
-                //If there is still an other option in the field, set other to true
+			//Check if all other options are really gone
+			foreach ( $options as $o_key => $o_val ) {
+				//If there is still an other option in the field, set other to true
 				if ( FrmFieldsHelper::is_other_opt( $o_key ) ) {
-                    $other = true;
-                    break;
-                }
-                unset( $o_key, $o_val );
-            }
-
-            //If all other options are gone
-            if ( false === $other ) {
-                $field_options = maybe_unserialize( $field->field_options );
-                $field_options['other'] = 0;
+					$other = true;
+					break;
+				}
+				unset( $o_key, $o_val );
+			}
+
+			//If all other options are gone
+			if ( false === $other ) {
+				$field_options = maybe_unserialize( $field->field_options );
+				$field_options['other'] = 0;
 				FrmField::update( $field_id, array( 'field_options' => maybe_serialize( $field_options ) ) );
-                $response = array( 'other' => false );
-            }
-        }
-        echo json_encode( $response );
+				$response = array( 'other' => false );
+			}
+		}
+		echo json_encode( $response );
 
 		FrmField::update( $field_id, array( 'options' => maybe_serialize( $options ) ) );
 
-        wp_die();
-    }
+		wp_die();
+	}
 
-    public static function import_choices() {
-        FrmAppHelper::permission_check( 'frm_edit_forms', 'hide' );
+	public static function import_choices() {
+		FrmAppHelper::permission_check( 'frm_edit_forms', 'hide' );
 
 		$field_id = absint( $_REQUEST['field_id'] );
 
-        global $current_screen, $hook_suffix;
+		global $current_screen, $hook_suffix;
 
-        // Catch plugins that include admin-header.php before admin.php completes.
-        if ( empty( $current_screen ) && function_exists( 'set_current_screen' ) ) {
-            $hook_suffix = '';
-        	set_current_screen();
-        }
+		// Catch plugins that include admin-header.php before admin.php completes.
+		if ( empty( $current_screen ) && function_exists( 'set_current_screen' ) ) {
+			$hook_suffix = '';
+			set_current_screen();
+		}
 
-        if ( function_exists( 'register_admin_color_schemes' ) ) {
-            register_admin_color_schemes();
-        }
+		if ( function_exists( 'register_admin_color_schemes' ) ) {
+			register_admin_color_schemes();
+		}
 
-        $hook_suffix = $admin_body_class = '';
+		$hook_suffix = $admin_body_class = '';
 
-        if ( get_user_setting( 'mfold' ) == 'f' ) {
-        	$admin_body_class .= ' folded';
-        }
+		if ( get_user_setting( 'mfold' ) == 'f' ) {
+			$admin_body_class .= ' folded';
+		}
 
-        if ( function_exists( 'is_admin_bar_showing' ) && is_admin_bar_showing() ) {
-        	$admin_body_class .= ' admin-bar';
-        }
+		if ( function_exists( 'is_admin_bar_showing' ) && is_admin_bar_showing() ) {
+			$admin_body_class .= ' admin-bar';
+		}
 
-        if ( is_rtl() ) {
-        	$admin_body_class .= ' rtl';
-        }
+		if ( is_rtl() ) {
+			$admin_body_class .= ' rtl';
+		}
 
-        $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
-        $prepop = array();
-        FrmFieldsHelper::get_bulk_prefilled_opts($prepop);
+		$admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
+		$prepop = array();
+		FrmFieldsHelper::get_bulk_prefilled_opts($prepop);
 
-        $field = FrmField::getOne($field_id);
+		$field = FrmField::getOne($field_id);
 
-        wp_enqueue_script( 'utils' );
+		wp_enqueue_script( 'utils' );
 		wp_enqueue_style( 'formidable-admin', FrmAppHelper::plugin_url() . '/css/frm_admin.css' );
-        FrmAppHelper::load_admin_wide_js();
+		FrmAppHelper::load_admin_wide_js();
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/import_choices.php' );
-        wp_die();
-    }
+		wp_die();
+	}
 
-    public static function import_options() {
+	public static function import_options() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        if ( ! is_admin() || ! current_user_can('frm_edit_forms') ) {
-            return;
-        }
+		if ( ! is_admin() || ! current_user_can('frm_edit_forms') ) {
+			return;
+		}
 
 		$field_id = absint( $_POST['field_id'] );
-        $field = FrmField::getOne($field_id);
+		$field = FrmField::getOne($field_id);
 
 		if ( ! in_array( $field->type, array( 'radio', 'checkbox', 'select' ) ) ) {
-            return;
-        }
-
-        $field = FrmFieldsHelper::setup_edit_vars($field);
-        $opts = stripslashes_deep($_POST['opts']);
-        $opts = explode("\n", rtrim($opts, "\n"));
-        if ( $field['separate_value'] ) {
-            foreach ( $opts as $opt_key => $opt ) {
-                if ( strpos($opt, '|') !== false ) {
-                    $vals = explode('|', $opt);
-                    if ( $vals[0] != $vals[1] ) {
-                        $opts[ $opt_key ] = array( 'label' => trim( $vals[0] ), 'value' => trim( $vals[1] ) );
-                    }
-                    unset($vals);
-                }
-                unset($opt_key, $opt);
-            }
-        }
-
-        //Keep other options after bulk update
-        if ( isset( $field['field_options']['other'] ) && $field['field_options']['other'] == true ) {
-            $other_array = array();
-            foreach ( $field['options'] as $opt_key => $opt ) {
-                if ( $opt_key && strpos( $opt_key, 'other' ) !== false ) {
-                    $other_array[ $opt_key ] = $opt;
-                }
-                unset($opt_key, $opt);
-            }
-            if ( ! empty($other_array) ) {
-                $opts = array_merge( $opts, $other_array);
-            }
-        }
-
-        FrmField::update( $field_id, array( 'options' => maybe_serialize( $opts ) ) );
-
-        $field['options'] = $opts;
-        $field_name = $field['name'];
-
-        // Get html_id which will be used in single-option.php
-        $html_id = FrmFieldsHelper::get_html_id( $field );
-
-        if ( $field['type'] == 'radio' || $field['type'] == 'checkbox' ) {
+			return;
+		}
+
+		$field = FrmFieldsHelper::setup_edit_vars($field);
+		$opts = stripslashes_deep($_POST['opts']);
+		$opts = explode("\n", rtrim($opts, "\n"));
+		if ( $field['separate_value'] ) {
+			foreach ( $opts as $opt_key => $opt ) {
+				if ( strpos($opt, '|') !== false ) {
+					$vals = explode('|', $opt);
+					if ( $vals[0] != $vals[1] ) {
+						$opts[ $opt_key ] = array( 'label' => trim( $vals[0] ), 'value' => trim( $vals[1] ) );
+					}
+					unset($vals);
+				}
+				unset($opt_key, $opt);
+			}
+		}
+
+		//Keep other options after bulk update
+		if ( isset( $field['field_options']['other'] ) && $field['field_options']['other'] == true ) {
+			$other_array = array();
+			foreach ( $field['options'] as $opt_key => $opt ) {
+				if ( $opt_key && strpos( $opt_key, 'other' ) !== false ) {
+					$other_array[ $opt_key ] = $opt;
+				}
+				unset($opt_key, $opt);
+			}
+			if ( ! empty($other_array) ) {
+				$opts = array_merge( $opts, $other_array);
+			}
+		}
+
+		FrmField::update( $field_id, array( 'options' => maybe_serialize( $opts ) ) );
+
+		$field['options'] = $opts;
+		$field_name = $field['name'];
+
+		// Get html_id which will be used in single-option.php
+		$html_id = FrmFieldsHelper::get_html_id( $field );
+
+		if ( $field['type'] == 'radio' || $field['type'] == 'checkbox' ) {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/radio.php' );
-        } else {
-            FrmFieldsHelper::show_single_option($field);
-        }
+		} else {
+			FrmFieldsHelper::show_single_option($field);
+		}
 
-        wp_die();
-    }
+		wp_die();
+	}
 
-    public static function update_order() {
+	public static function update_order() {
 		FrmAppHelper::permission_check('frm_edit_forms');
-        check_ajax_referer( 'frm_ajax', 'nonce' );
+		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$fields = FrmAppHelper::get_post_param( 'frm_field_id' );
 		foreach ( (array) $fields as $position => $item ) {
 			FrmField::update( absint( $item ), array( 'field_order' => absint( $position ) ) );
 		}
-        wp_die();
-    }
+		wp_die();
+	}
 
 	public static function change_type( $type ) {
-        $type_switch = array(
-            'scale'     => 'radio',
-            '10radio'   => 'radio',
-            'rte'       => 'textarea',
-            'website'   => 'url',
-        );
-        if ( isset( $type_switch[ $type ] ) ) {
-            $type = $type_switch[ $type ];
-        }
+		$type_switch = array(
+			'scale'     => 'radio',
+			'10radio'   => 'radio',
+			'rte'       => 'textarea',
+			'website'   => 'url',
+		);
+		if ( isset( $type_switch[ $type ] ) ) {
+			$type = $type_switch[ $type ];
+		}
 
 		$frm_field_selection = FrmField::field_selection();
-        $types = array_keys($frm_field_selection);
-        if ( ! in_array($type, $types) && $type != 'captcha' ) {
-            $type = 'text';
-        }
+		$types = array_keys($frm_field_selection);
+		if ( ! in_array($type, $types) && $type != 'captcha' ) {
+			$type = 'text';
+		}
 
-        return $type;
-    }
+		return $type;
+	}
 
 	public static function display_field_options( $display ) {
 		switch ( $display['type'] ) {
-            case 'captcha':
-                $display['required'] = false;
-                $display['invalid'] = true;
-                $display['default_blank'] = false;
+			case 'captcha':
+				$display['required'] = false;
+				$display['invalid'] = true;
+				$display['default_blank'] = false;
 				$display['captcha_size'] = true;
-            break;
-            case 'radio':
-                $display['default_blank'] = false;
-            break;
-            case 'text':
-            case 'textarea':
-                $display['size'] = true;
-                $display['clear_on_focus'] = true;
-            break;
-            case 'select':
-                $display['size'] = true;
-            break;
-            case 'url':
-            case 'website':
-            case 'email':
-                $display['size'] = true;
-                $display['clear_on_focus'] = true;
-                $display['invalid'] = true;
-        }
-
-        return $display;
-    }
-
-    public static function input_html( $field, $echo = true ) {
-        $class = array(); //$field['type'];
-        self::add_input_classes($field, $class);
-
-        $add_html = array();
-        self::add_html_size($field, $add_html);
-        self::add_html_length($field, $add_html);
-        self::add_html_placeholder($field, $add_html, $class);
+			break;
+			case 'radio':
+				$display['default_blank'] = false;
+			break;
+			case 'text':
+			case 'textarea':
+				$display['size'] = true;
+				$display['clear_on_focus'] = true;
+			break;
+			case 'select':
+				$display['size'] = true;
+			break;
+			case 'url':
+			case 'website':
+			case 'email':
+				$display['size'] = true;
+				$display['clear_on_focus'] = true;
+				$display['invalid'] = true;
+		}
+
+		return $display;
+	}
+
+	public static function input_html( $field, $echo = true ) {
+		$class = array(); //$field['type'];
+		self::add_input_classes($field, $class);
+
+		$add_html = array();
+		self::add_html_size($field, $add_html);
+		self::add_html_length($field, $add_html);
+		self::add_html_placeholder($field, $add_html, $class);
 		self::add_validation_messages( $field, $add_html );
 
-        $class = apply_filters('frm_field_classes', implode(' ', $class), $field);
+		$class = apply_filters('frm_field_classes', implode(' ', $class), $field);
 
 		FrmFormsHelper::add_html_attr( $class, 'class', $add_html );
 
-        self::add_shortcodes_to_html($field, $add_html);
+		self::add_shortcodes_to_html($field, $add_html);
 
 		$add_html = apply_filters( 'frm_field_extra_html', $add_html, $field );
 		$add_html = ' ' . implode( ' ', $add_html ) . '  ';
 
-        if ( $echo ) {
-            echo $add_html;
-        }
+		if ( $echo ) {
+			echo $add_html;
+		}
 
-        return $add_html;
-    }
+		return $add_html;
+	}
 
 	private static function add_input_classes( $field, array &$class ) {
-        if ( isset($field['input_class']) && ! empty($field['input_class']) ) {
-            $class[] = $field['input_class'];
-        }
+		if ( isset($field['input_class']) && ! empty($field['input_class']) ) {
+			$class[] = $field['input_class'];
+		}
 
-        if ( $field['type'] == 'hidden' || $field['type'] == 'user_id' ) {
-            return;
-        }
+		if ( $field['type'] == 'hidden' || $field['type'] == 'user_id' ) {
+			return;
+		}
 
-        global $frm_vars;
+		global $frm_vars;
 		if ( is_admin() && ! FrmAppHelper::is_preview_page() && ! in_array( $field['type'], array( 'scale', 'radio', 'checkbox', 'data' ) ) ) {
-            $class[] = 'dyn_default_value';
-        }
+			$class[] = 'dyn_default_value';
+		}
 
-        if ( isset($field['size']) && $field['size'] > 0 ) {
-            $class[] = 'auto_width';
-        }
-    }
+		if ( isset($field['size']) && $field['size'] > 0 ) {
+			$class[] = 'auto_width';
+		}
+	}
 
 	private static function add_html_size( $field, array &$add_html ) {
 		if ( ! isset( $field['size'] ) || $field['size'] <= 0 || in_array( $field['type'], array( 'select', 'data', 'time', 'hidden' ) ) ) {
-            return;
-        }
+			return;
+		}
 
-        if ( FrmAppHelper::is_admin_page('formidable' ) ) {
-            return;
-        }
+		if ( FrmAppHelper::is_admin_page('formidable' ) ) {
+			return;
+		}
 
-        if ( is_numeric($field['size']) ) {
-            $field['size'] .= 'px';
-        }
+		if ( is_numeric($field['size']) ) {
+			$field['size'] .= 'px';
+		}
 
-        $important = apply_filters('frm_use_important_width', 1, $field);
-        // Note: This inline styling must stay since we cannot realistically set a class for every possible field size
+		$important = apply_filters('frm_use_important_width', 1, $field);
+		// Note: This inline styling must stay since we cannot realistically set a class for every possible field size
 		$add_html['style'] = 'style="width:' . esc_attr( $field['size'] ) . ( $important ? ' !important' : '' ) . '"';
 
-        self::add_html_cols($field, $add_html);
-    }
+		self::add_html_cols($field, $add_html);
+	}
 
 	private static function add_html_cols( $field, array &$add_html ) {
 		if ( ! in_array( $field['type'], array( 'textarea', 'rte' ) ) ) {
-            return;
-        }
+			return;
+		}
 
-        // convert to cols for textareas
-        $calc = array(
-            ''      => 9,
-            'px'    => 9,
-            'rem'   => 0.444,
-            'em'    => 0.544,
-        );
+		// convert to cols for textareas
+		$calc = array(
+			''      => 9,
+			'px'    => 9,
+			'rem'   => 0.444,
+			'em'    => 0.544,
+		);
 
-        // include "col" for valid html
-        $unit = trim(preg_replace('/[0-9]+/', '', $field['size']));
+		// include "col" for valid html
+		$unit = trim(preg_replace('/[0-9]+/', '', $field['size']));
 
-        if ( ! isset( $calc[ $unit ] ) ) {
-            return;
-        }
+		if ( ! isset( $calc[ $unit ] ) ) {
+			return;
+		}
 
-        $size = (float) str_replace( $unit, '', $field['size'] ) / $calc[ $unit ];
+		$size = (float) str_replace( $unit, '', $field['size'] ) / $calc[ $unit ];
 
 		$add_html['cols'] = 'cols="' . absint( $size ) . '"';
-    }
+	}
 
 	private static function add_html_length( $field, array &$add_html ) {
-        // check for max setting and if this field accepts maxlength
+		// check for max setting and if this field accepts maxlength
 		if ( FrmField::is_option_empty( $field, 'max' ) || in_array( $field['type'], array( 'textarea', 'rte', 'hidden' ) ) ) {
-            return;
-        }
+			return;
+		}
 
-        if ( FrmAppHelper::is_admin_page('formidable' ) ) {
-            // don't load on form builder page
-            return;
-        }
+		if ( FrmAppHelper::is_admin_page('formidable' ) ) {
+			// don't load on form builder page
+			return;
+		}
 
 		$add_html['maxlength'] = 'maxlength="' . esc_attr( $field['max'] ) . '"';
-    }
+	}
 
 	private static function add_html_placeholder( $field, array &$add_html, array &$class ) {
 		if ( empty( $field['default_value'] ) || FrmAppHelper::is_admin_page( 'formidable' ) ) {
@@ -644,35 +644,35 @@ 
 		}
 
 		$default_value_array = is_array( $field['default_value'] );
-        if ( ! FrmField::is_option_true( $field, 'clear_on_focus' ) ) {
+		if ( ! FrmField::is_option_true( $field, 'clear_on_focus' ) ) {
 			if ( $default_value_array ) {
 				$field['default_value'] = json_encode( $field['default_value'] );
 			}
 			$add_html['data-frmval'] = 'data-frmval="' . esc_attr( $field['default_value'] ) . '"';
-            return;
-        }
+			return;
+		}
 
 		if ( $default_value_array ) {
 			// don't include a json placeholder
 			return;
 		}
 
-        $frm_settings = FrmAppHelper::get_settings();
+		$frm_settings = FrmAppHelper::get_settings();
 
 		if ( $frm_settings->use_html && ! in_array( $field['type'], array( 'select', 'radio', 'checkbox', 'hidden' ) ) ) {
-            // use HMTL5 placeholder with js fallback
+			// use HMTL5 placeholder with js fallback
 			$add_html['placeholder'] = 'placeholder="' . esc_attr( $field['default_value'] ) . '"';
-            wp_enqueue_script('jquery-placeholder');
-        } else if ( ! $frm_settings->use_html ) {
+			wp_enqueue_script('jquery-placeholder');
+		} else if ( ! $frm_settings->use_html ) {
 			$val = str_replace( array( "\r\n", "\n" ), '\r', addslashes( str_replace( '&#039;', "'", esc_attr( $field['default_value'] ) ) ) );
 			$add_html['data-frmval'] = 'data-frmval="' . esc_attr( $val ) . '"';
-            $class[] = 'frm_toggle_default';
+			$class[] = 'frm_toggle_default';
 
-            if ( $field['value'] == $field['default_value'] ) {
-                $class[] = 'frm_default';
-            }
-        }
-    }
+			if ( $field['value'] == $field['default_value'] ) {
+				$class[] = 'frm_default';
+			}
+		}
+	}
 
 	private static function add_validation_messages( $field, array &$add_html ) {
 		if ( FrmField::is_required( $field ) ) {
@@ -693,44 +693,44 @@ 
 		}
 	}
 
-    private static function add_shortcodes_to_html( $field, array &$add_html ) {
-        if ( FrmField::is_option_empty( $field, 'shortcodes' ) ) {
-            return;
-        }
+	private static function add_shortcodes_to_html( $field, array &$add_html ) {
+		if ( FrmField::is_option_empty( $field, 'shortcodes' ) ) {
+			return;
+		}
 
-        foreach ( $field['shortcodes'] as $k => $v ) {
-            if ( 'opt' === $k ) {
-                continue;
-            }
+		foreach ( $field['shortcodes'] as $k => $v ) {
+			if ( 'opt' === $k ) {
+				continue;
+			}
 
-            if ( is_numeric($k) && strpos($v, '=') ) {
-                $add_html[] = $v;
-            } else if ( ! empty( $k ) && isset( $add_html[ $k ] ) ) {
+			if ( is_numeric($k) && strpos($v, '=') ) {
+				$add_html[] = $v;
+			} else if ( ! empty( $k ) && isset( $add_html[ $k ] ) ) {
 				$add_html[ $k ] = str_replace( $k . '="', $k . '="' . $v, $add_html[ $k ] );
-            } else {
+			} else {
 				$add_html[ $k ] = $k . '="' . esc_attr( $v ) . '"';
-            }
-
-            unset($k, $v);
-        }
-    }
-
-    public static function check_value( $opt, $opt_key, $field ) {
-        if ( is_array( $opt ) ) {
-            if ( FrmField::is_option_true( $field, 'separate_value' ) ) {
-                $opt = isset( $opt['value'] ) ? $opt['value'] : ( isset( $opt['label'] ) ? $opt['label'] : reset( $opt ) );
-            } else {
-                $opt = isset( $opt['label'] ) ? $opt['label'] : reset( $opt );
-            }
-        }
-        return $opt;
-    }
+			}
+
+			unset($k, $v);
+		}
+	}
+
+	public static function check_value( $opt, $opt_key, $field ) {
+		if ( is_array( $opt ) ) {
+			if ( FrmField::is_option_true( $field, 'separate_value' ) ) {
+				$opt = isset( $opt['value'] ) ? $opt['value'] : ( isset( $opt['label'] ) ? $opt['label'] : reset( $opt ) );
+			} else {
+				$opt = isset( $opt['label'] ) ? $opt['label'] : reset( $opt );
+			}
+		}
+		return $opt;
+	}
 
 	public static function check_label( $opt ) {
-        if ( is_array($opt) ) {
-            $opt = (isset($opt['label']) ? $opt['label'] : reset($opt));
-        }
+		if ( is_array($opt) ) {
+			$opt = (isset($opt['label']) ? $opt['label'] : reset($opt));
+		}
 
-        return $opt;
-    }
+		return $opt;
+	}
 }

Spacing +93 added lines, -93 removed lines

@@ -3,7 +3,7 @@ 
 class FrmFieldsController {
 
     public static function load_field() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
         $fields = $_POST['field'];
@@ -33,33 +33,33 @@ 
                 $field['value'] = '';
             }
 
-			$field_name = 'item_meta['. $field_id .']';
-            $html_id = FrmFieldsHelper::get_html_id($field);
+			$field_name = 'item_meta[' . $field_id . ']';
+            $html_id = FrmFieldsHelper::get_html_id( $field );
 
             ob_start();
 			include( $path . '/classes/views/frm-forms/add_field.php' );
-            $field_html[ $field_id ] = ob_get_contents();
+            $field_html[$field_id] = ob_get_contents();
             ob_end_clean();
         }
 
-        unset($path);
+        unset( $path );
 
-        echo json_encode($field_html);
+        echo json_encode( $field_html );
 
         wp_die();
     }
 
     public static function create() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_type = FrmAppHelper::get_post_param( 'field', '', 'sanitize_text_field' );
 		$form_id = FrmAppHelper::get_post_param( 'form_id', 0, 'absint' );
 
-        $field = self::include_new_field($field_type, $form_id);
+        $field = self::include_new_field( $field_type, $form_id );
 
         // this hook will allow for multiple fields to be added at once
-        do_action('frm_after_field_created', $field, $form_id);
+        do_action( 'frm_after_field_created', $field, $form_id );
 
         wp_die();
     }
@@ -70,23 +70,23 @@ 
 	public static function include_new_field( $field_type, $form_id ) {
         $values = array();
         if ( FrmAppHelper::pro_is_installed() ) {
-            $values['post_type'] = FrmProFormsHelper::post_type($form_id);
+            $values['post_type'] = FrmProFormsHelper::post_type( $form_id );
         }
 
-        $field_values = apply_filters('frm_before_field_created', FrmFieldsHelper::setup_new_vars($field_type, $form_id));
+        $field_values = apply_filters( 'frm_before_field_created', FrmFieldsHelper::setup_new_vars( $field_type, $form_id ) );
         $field_id = FrmField::create( $field_values );
 
         if ( ! $field_id ) {
             return false;
         }
 
-        $field = self::include_single_field($field_id, $values, $form_id);
+        $field = self::include_single_field( $field_id, $values, $form_id );
 
         return $field;
     }
 
     public static function update_form_id() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_id = FrmAppHelper::get_post_param( 'field', 0, 'absint' );
@@ -103,21 +103,21 @@ 
     }
 
 	public static function edit_name( $field = 'name', $id = '' ) {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        if ( empty($field) ) {
+        if ( empty( $field ) ) {
             $field = 'name';
         }
 
-        if ( empty($id) ) {
+        if ( empty( $id ) ) {
 			$id = FrmAppHelper::get_post_param( 'element_id', '', 'sanitize_title' );
 			$id = str_replace( 'field_label_', '', $id );
         }
 
 		$value = FrmAppHelper::get_post_param( 'update_value', '', 'wp_kses_post' );
 		$value = trim( $value );
-        if ( trim(strip_tags($value)) == '' ) {
+        if ( trim( strip_tags( $value ) ) == '' ) {
             // set blank value if there is no content
             $value = '';
         }
@@ -131,7 +131,7 @@ 
     }
 
     public static function update_ajax_option() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_id = FrmAppHelper::get_post_param( 'field', 0, 'absint' );
@@ -144,7 +144,7 @@ 
 		if ( isset( $_POST['separate_value'] ) ) {
 			$new_val = FrmField::is_option_true( $field, 'separate_value' ) ? 0 : 1;
 			$field->field_options['separate_value'] = $new_val;
-			unset($new_val);
+			unset( $new_val );
 		}
 
         FrmField::update( $field_id, array(
@@ -155,7 +155,7 @@ 
     }
 
     public static function duplicate() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
         global $wpdb;
@@ -178,11 +178,11 @@ 
 
         $values['field_order'] = $field_count + 1;
 
-        if ( ! $field_id = FrmField::create($values) ) {
+        if ( ! $field_id = FrmField::create( $values ) ) {
             wp_die();
         }
 
-        self::include_single_field($field_id, $values);
+        self::include_single_field( $field_id, $values );
 
         wp_die();
     }
@@ -191,9 +191,9 @@ 
      * Load a single field in the form builder along with all needed variables
      */
     public static function include_single_field( $field_id, $values, $form_id = 0 ) {
-        $field = FrmFieldsHelper::setup_edit_vars(FrmField::getOne($field_id));
+        $field = FrmFieldsHelper::setup_edit_vars( FrmField::getOne( $field_id ) );
 		$field_name = 'item_meta[' . $field_id . ']';
-        $html_id = FrmFieldsHelper::get_html_id($field);
+        $html_id = FrmFieldsHelper::get_html_id( $field );
         $id = $form_id ? $form_id : $field['form_id'];
         if ( $field['type'] == 'html' ) {
             $field['stop_filter'] = true;
@@ -205,7 +205,7 @@ 
     }
 
     public static function destroy() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_id = FrmAppHelper::get_post_param( 'field_id', 0, 'absint' );
@@ -217,14 +217,14 @@ 
 
     //Add Single Option or Other Option
     public static function add_option() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$id = FrmAppHelper::get_post_param( 'field_id', 0, 'absint' );
 		$opt_type = FrmAppHelper::get_post_param( 'opt_type', '', 'sanitize_text_field' );
 
         //Get the field
-        $field = FrmField::getOne($id);
+        $field = FrmField::getOne( $id );
 
 		if ( ! empty( $field->options ) ) {
 			$keys = array_keys( $field->options );
@@ -247,13 +247,13 @@ 
 			$first_opt = reset( $field->options );
 			$next_opt = count( $field->options );
             if ( $first_opt != '' ) {
-                $next_opt++;
+                $next_opt ++;
             }
 			$opt = esc_html__( 'Option', 'formidable' ) . ' ' . $next_opt;
-            unset($next_opt);
+            unset( $next_opt );
         }
         $field_val = $opt;
-		$field->options[ $opt_key ] = $opt;
+		$field->options[$opt_key] = $opt;
 
         //Update options in DB
 		FrmField::update( $id, array( 'options' => $field->options ) );
@@ -262,13 +262,13 @@ 
         $field = array(
             'type'  => $field_data->type,
             'id'    => $id,
-            'separate_value' => isset($field_data->field_options['separate_value']) ? $field_data->field_options['separate_value'] : 0,
+            'separate_value' => isset( $field_data->field_options['separate_value'] ) ? $field_data->field_options['separate_value'] : 0,
             'form_id' => $field_data->form_id,
             'field_key' => $field_data->field_key,
         );
 
 		$field_name = 'item_meta[' . $id . ']';
-        $html_id = FrmFieldsHelper::get_html_id($field);
+        $html_id = FrmFieldsHelper::get_html_id( $field );
         $checked = '';
 
         if ( 'other' == $opt_type ) {
@@ -280,7 +280,7 @@ 
     }
 
     public static function edit_option() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$element_id = FrmAppHelper::get_post_param( 'element_id', '', 'sanitize_title' );
@@ -294,28 +294,28 @@ 
             $new_label = $update_value;
         }
 
-        $field = FrmField::getOne($id);
+        $field = FrmField::getOne( $id );
         $separate_values = FrmField::is_option_true( $field, 'separate_value' );
 
-        $this_opt_id = end($ids);
-		$this_opt = (array) $field->options[ $this_opt_id ];
-		$other_opt = ( $this_opt_id && strpos( $this_opt_id, 'other') !== false );
+        $this_opt_id = end( $ids );
+		$this_opt = (array) $field->options[$this_opt_id];
+		$other_opt = ( $this_opt_id && strpos( $this_opt_id, 'other' ) !== false );
 
-        $label = isset($this_opt['label']) ? $this_opt['label'] : reset($this_opt);
-        $value = isset($this_opt['value']) ? $this_opt['value'] : '';
+        $label = isset( $this_opt['label'] ) ? $this_opt['label'] : reset( $this_opt );
+        $value = isset( $this_opt['value'] ) ? $this_opt['value'] : '';
 
         if ( ! isset( $new_label ) ) {
             $new_label = $label;
         }
 
-        if ( isset($new_value) || isset($value) ) {
-            $update_value = isset($new_value) ? $new_value : $value;
+        if ( isset( $new_value ) || isset( $value ) ) {
+            $update_value = isset( $new_value ) ? $new_value : $value;
         }
 
 		if ( $update_value != $new_label && $other_opt === false && $separate_values ) {
-			$field->options[ $this_opt_id ] = array( 'value' => $update_value, 'label' => $new_label );
+			$field->options[$this_opt_id] = array( 'value' => $update_value, 'label' => $new_label );
         } else {
-			$field->options[ $this_opt_id ] = $orig_update_value;
+			$field->options[$this_opt_id] = $orig_update_value;
         }
 
 		FrmField::update( $field->id, array( 'options' => $field->options ) );
@@ -324,7 +324,7 @@ 
     }
 
     public static function delete_option() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$field_id = FrmAppHelper::get_post_param( 'field_id', 0, 'absint' );
@@ -333,7 +333,7 @@ 
 		$opt_key = FrmAppHelper::get_post_param( 'opt_key', 0, 'sanitize_title' );
 
 		$options = $field->options;
-        unset( $options[ $opt_key ] );
+        unset( $options[$opt_key] );
         $response = array( 'other' => true );
 
         //If the deleted option is an "other" option
@@ -399,9 +399,9 @@ 
 
         $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
         $prepop = array();
-        FrmFieldsHelper::get_bulk_prefilled_opts($prepop);
+        FrmFieldsHelper::get_bulk_prefilled_opts( $prepop );
 
-        $field = FrmField::getOne($field_id);
+        $field = FrmField::getOne( $field_id );
 
         wp_enqueue_script( 'utils' );
 		wp_enqueue_style( 'formidable-admin', FrmAppHelper::plugin_url() . '/css/frm_admin.css' );
@@ -412,33 +412,33 @@ 
     }
 
     public static function import_options() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
-        if ( ! is_admin() || ! current_user_can('frm_edit_forms') ) {
+        if ( ! is_admin() || ! current_user_can( 'frm_edit_forms' ) ) {
             return;
         }
 
 		$field_id = absint( $_POST['field_id'] );
-        $field = FrmField::getOne($field_id);
+        $field = FrmField::getOne( $field_id );
 
 		if ( ! in_array( $field->type, array( 'radio', 'checkbox', 'select' ) ) ) {
             return;
         }
 
-        $field = FrmFieldsHelper::setup_edit_vars($field);
-        $opts = stripslashes_deep($_POST['opts']);
-        $opts = explode("\n", rtrim($opts, "\n"));
+        $field = FrmFieldsHelper::setup_edit_vars( $field );
+        $opts = stripslashes_deep( $_POST['opts'] );
+        $opts = explode( "\n", rtrim( $opts, "\n" ) );
         if ( $field['separate_value'] ) {
             foreach ( $opts as $opt_key => $opt ) {
-                if ( strpos($opt, '|') !== false ) {
-                    $vals = explode('|', $opt);
+                if ( strpos( $opt, '|' ) !== false ) {
+                    $vals = explode( '|', $opt );
                     if ( $vals[0] != $vals[1] ) {
-                        $opts[ $opt_key ] = array( 'label' => trim( $vals[0] ), 'value' => trim( $vals[1] ) );
+                        $opts[$opt_key] = array( 'label' => trim( $vals[0] ), 'value' => trim( $vals[1] ) );
                     }
-                    unset($vals);
+                    unset( $vals );
                 }
-                unset($opt_key, $opt);
+                unset( $opt_key, $opt );
             }
         }
 
@@ -447,12 +447,12 @@ 
             $other_array = array();
             foreach ( $field['options'] as $opt_key => $opt ) {
                 if ( $opt_key && strpos( $opt_key, 'other' ) !== false ) {
-                    $other_array[ $opt_key ] = $opt;
+                    $other_array[$opt_key] = $opt;
                 }
-                unset($opt_key, $opt);
+                unset( $opt_key, $opt );
             }
-            if ( ! empty($other_array) ) {
-                $opts = array_merge( $opts, $other_array);
+            if ( ! empty( $other_array ) ) {
+                $opts = array_merge( $opts, $other_array );
             }
         }
 
@@ -467,14 +467,14 @@ 
         if ( $field['type'] == 'radio' || $field['type'] == 'checkbox' ) {
 			require( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/radio.php' );
         } else {
-            FrmFieldsHelper::show_single_option($field);
+            FrmFieldsHelper::show_single_option( $field );
         }
 
         wp_die();
     }
 
     public static function update_order() {
-		FrmAppHelper::permission_check('frm_edit_forms');
+		FrmAppHelper::permission_check( 'frm_edit_forms' );
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$fields = FrmAppHelper::get_post_param( 'frm_field_id' );
@@ -491,13 +491,13 @@ 
             'rte'       => 'textarea',
             'website'   => 'url',
         );
-        if ( isset( $type_switch[ $type ] ) ) {
-            $type = $type_switch[ $type ];
+        if ( isset( $type_switch[$type] ) ) {
+            $type = $type_switch[$type];
         }
 
 		$frm_field_selection = FrmField::field_selection();
-        $types = array_keys($frm_field_selection);
-        if ( ! in_array($type, $types) && $type != 'captcha' ) {
+        $types = array_keys( $frm_field_selection );
+        if ( ! in_array( $type, $types ) && $type != 'captcha' ) {
             $type = 'text';
         }
 
@@ -536,19 +536,19 @@ 
 
     public static function input_html( $field, $echo = true ) {
         $class = array(); //$field['type'];
-        self::add_input_classes($field, $class);
+        self::add_input_classes( $field, $class );
 
         $add_html = array();
-        self::add_html_size($field, $add_html);
-        self::add_html_length($field, $add_html);
-        self::add_html_placeholder($field, $add_html, $class);
+        self::add_html_size( $field, $add_html );
+        self::add_html_length( $field, $add_html );
+        self::add_html_placeholder( $field, $add_html, $class );
 		self::add_validation_messages( $field, $add_html );
 
-        $class = apply_filters('frm_field_classes', implode(' ', $class), $field);
+        $class = apply_filters( 'frm_field_classes', implode( ' ', $class ), $field );
 
 		FrmFormsHelper::add_html_attr( $class, 'class', $add_html );
 
-        self::add_shortcodes_to_html($field, $add_html);
+        self::add_shortcodes_to_html( $field, $add_html );
 
 		$add_html = apply_filters( 'frm_field_extra_html', $add_html, $field );
 		$add_html = ' ' . implode( ' ', $add_html ) . '  ';
@@ -561,7 +561,7 @@ 
     }
 
 	private static function add_input_classes( $field, array &$class ) {
-        if ( isset($field['input_class']) && ! empty($field['input_class']) ) {
+        if ( isset( $field['input_class'] ) && ! empty( $field['input_class'] ) ) {
             $class[] = $field['input_class'];
         }
 
@@ -574,7 +574,7 @@ 
             $class[] = 'dyn_default_value';
         }
 
-        if ( isset($field['size']) && $field['size'] > 0 ) {
+        if ( isset( $field['size'] ) && $field['size'] > 0 ) {
             $class[] = 'auto_width';
         }
     }
@@ -584,19 +584,19 @@ 
             return;
         }
 
-        if ( FrmAppHelper::is_admin_page('formidable' ) ) {
+        if ( FrmAppHelper::is_admin_page( 'formidable' ) ) {
             return;
         }
 
-        if ( is_numeric($field['size']) ) {
+        if ( is_numeric( $field['size'] ) ) {
             $field['size'] .= 'px';
         }
 
-        $important = apply_filters('frm_use_important_width', 1, $field);
+        $important = apply_filters( 'frm_use_important_width', 1, $field );
         // Note: This inline styling must stay since we cannot realistically set a class for every possible field size
 		$add_html['style'] = 'style="width:' . esc_attr( $field['size'] ) . ( $important ? ' !important' : '' ) . '"';
 
-        self::add_html_cols($field, $add_html);
+        self::add_html_cols( $field, $add_html );
     }
 
 	private static function add_html_cols( $field, array &$add_html ) {
@@ -613,13 +613,13 @@ 
         );
 
         // include "col" for valid html
-        $unit = trim(preg_replace('/[0-9]+/', '', $field['size']));
+        $unit = trim( preg_replace( '/[0-9]+/', '', $field['size'] ) );
 
-        if ( ! isset( $calc[ $unit ] ) ) {
+        if ( ! isset( $calc[$unit] ) ) {
             return;
         }
 
-        $size = (float) str_replace( $unit, '', $field['size'] ) / $calc[ $unit ];
+        $size = (float) str_replace( $unit, '', $field['size'] ) / $calc[$unit];
 
 		$add_html['cols'] = 'cols="' . absint( $size ) . '"';
     }
@@ -630,7 +630,7 @@ 
             return;
         }
 
-        if ( FrmAppHelper::is_admin_page('formidable' ) ) {
+        if ( FrmAppHelper::is_admin_page( 'formidable' ) ) {
             // don't load on form builder page
             return;
         }
@@ -662,7 +662,7 @@ 
 		if ( $frm_settings->use_html && ! in_array( $field['type'], array( 'select', 'radio', 'checkbox', 'hidden' ) ) ) {
             // use HMTL5 placeholder with js fallback
 			$add_html['placeholder'] = 'placeholder="' . esc_attr( $field['default_value'] ) . '"';
-            wp_enqueue_script('jquery-placeholder');
+            wp_enqueue_script( 'jquery-placeholder' );
         } else if ( ! $frm_settings->use_html ) {
 			$val = str_replace( array( "\r\n", "\n" ), '\r', addslashes( str_replace( ''', "'", esc_attr( $field['default_value'] ) ) ) );
 			$add_html['data-frmval'] = 'data-frmval="' . esc_attr( $val ) . '"';
@@ -689,7 +689,7 @@ 
 			$format = FrmEntryValidate::phone_format( $field );
 			$format = substr( $format, 2, -2 );
 			$key = 'pattern';
-			$add_html[ $key ] = $key . '="' . esc_attr( $format ) . '"';
+			$add_html[$key] = $key . '="' . esc_attr( $format ) . '"';
 		}
 	}
 
@@ -703,15 +703,15 @@ 
                 continue;
             }
 
-            if ( is_numeric($k) && strpos($v, '=') ) {
+            if ( is_numeric( $k ) && strpos( $v, '=' ) ) {
                 $add_html[] = $v;
-            } else if ( ! empty( $k ) && isset( $add_html[ $k ] ) ) {
-				$add_html[ $k ] = str_replace( $k . '="', $k . '="' . $v, $add_html[ $k ] );
+            } else if ( ! empty( $k ) && isset( $add_html[$k] ) ) {
+				$add_html[$k] = str_replace( $k . '="', $k . '="' . $v, $add_html[$k] );
             } else {
-				$add_html[ $k ] = $k . '="' . esc_attr( $v ) . '"';
+				$add_html[$k] = $k . '="' . esc_attr( $v ) . '"';
             }
 
-            unset($k, $v);
+            unset( $k, $v );
         }
     }
 
@@ -727,8 +727,8 @@ 
     }
 
 	public static function check_label( $opt ) {
-        if ( is_array($opt) ) {
-            $opt = (isset($opt['label']) ? $opt['label'] : reset($opt));
+        if ( is_array( $opt ) ) {
+            $opt = ( isset( $opt['label'] ) ? $opt['label'] : reset( $opt ) );
         }
 
         return $opt;

classes/controllers/FrmAddonsController.php

Spacing +6 added lines, -6 removed lines

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

classes/controllers/FrmXMLController.php

Indentation +181 added lines, -181 removed lines

@@ -2,110 +2,110 @@ 
 
 class FrmXMLController {
 
-    public static function menu() {
+	public static function menu() {
 		add_submenu_page( 'formidable', 'Formidable | ' . __( 'Import/Export', 'formidable' ), __( 'Import/Export', 'formidable' ), 'frm_edit_forms', 'formidable-import', 'FrmXMLController::route' );
-    }
+	}
 
-    public static function add_default_templates() {
+	public static function add_default_templates() {
 		if ( ! function_exists( 'libxml_disable_entity_loader' ) ) {
-    		// XML import is not enabled on your server
-    		return;
-    	}
+			// XML import is not enabled on your server
+			return;
+		}
 
-        $set_err = libxml_use_internal_errors(true);
-        $loader = libxml_disable_entity_loader( true );
+		$set_err = libxml_use_internal_errors(true);
+		$loader = libxml_disable_entity_loader( true );
 
 		$files = apply_filters( 'frm_default_templates_files', array( FrmAppHelper::plugin_path() . '/classes/views/xml/default-templates.xml' ) );
 
-        foreach ( (array) $files as $file ) {
-            FrmXMLHelper::import_xml($file);
-            unset($file);
-        }
-        /*
+		foreach ( (array) $files as $file ) {
+			FrmXMLHelper::import_xml($file);
+			unset($file);
+		}
+		/*
         if(is_wp_error($result))
             $errors[] = $result->get_error_message();
         else if($result)
             $message = $result;
         */
 
-        unset( $files );
+		unset( $files );
 
-        libxml_use_internal_errors( $set_err );
-    	libxml_disable_entity_loader( $loader );
-    }
+		libxml_use_internal_errors( $set_err );
+		libxml_disable_entity_loader( $loader );
+	}
 
-    public static function route() {
-        $action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
+	public static function route() {
+		$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
 		$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
 		if ( $action == 'import_xml' ) {
-            return self::import_xml();
+			return self::import_xml();
 		} else if ( $action == 'export_xml' ) {
-            return self::export_xml();
-        } else {
-            if ( apply_filters( 'frm_xml_route', true, $action ) ) {
-                return self::form();
-            }
-        }
-    }
-
-    public static function form( $errors = array(), $message = '' ) {
+			return self::export_xml();
+		} else {
+			if ( apply_filters( 'frm_xml_route', true, $action ) ) {
+				return self::form();
+			}
+		}
+	}
+
+	public static function form( $errors = array(), $message = '' ) {
 		$where = array(
 			'parent_form_id' => array( null, 0 ),
 			'status' => array( null, '', 'published' ),
 		);
 		$forms = FrmForm::getAll( $where, 'name' );
 
-        $export_types = apply_filters( 'frm_xml_export_types',
-            array( 'forms' => __( 'Forms', 'formidable' ), 'items' => __( 'Entries', 'formidable' ) )
-        );
+		$export_types = apply_filters( 'frm_xml_export_types',
+			array( 'forms' => __( 'Forms', 'formidable' ), 'items' => __( 'Entries', 'formidable' ) )
+		);
 
-        $export_format = apply_filters( 'frm_export_formats', array(
-            'xml' => array( 'name' => 'XML', 'support' => 'forms', 'count' => 'multiple' ),
+		$export_format = apply_filters( 'frm_export_formats', array(
+			'xml' => array( 'name' => 'XML', 'support' => 'forms', 'count' => 'multiple' ),
 			'csv' => array( 'name' => 'CSV', 'support' => 'items', 'count' => 'single' ),
-        ) );
+		) );
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/xml/import_form.php' );
-    }
+	}
 
-    public static function import_xml() {
-        $errors = array();
-        $message = '';
+	public static function import_xml() {
+		$errors = array();
+		$message = '';
 
-        $permission_error = FrmAppHelper::permission_nonce_error('frm_edit_forms', 'import-xml', 'import-xml-nonce');
-        if ( $permission_error !== false ) {
-            $errors[] = $permission_error;
-            self::form($errors);
-            return;
-        }
+		$permission_error = FrmAppHelper::permission_nonce_error('frm_edit_forms', 'import-xml', 'import-xml-nonce');
+		if ( $permission_error !== false ) {
+			$errors[] = $permission_error;
+			self::form($errors);
+			return;
+		}
 
-        if ( ! isset($_FILES) || ! isset($_FILES['frm_import_file']) || empty($_FILES['frm_import_file']['name']) || (int) $_FILES['frm_import_file']['size'] < 1 ) {
-            $errors[] = __( 'Oops, you didn\'t select a file.', 'formidable' );
-            self::form($errors);
-            return;
-        }
+		if ( ! isset($_FILES) || ! isset($_FILES['frm_import_file']) || empty($_FILES['frm_import_file']['name']) || (int) $_FILES['frm_import_file']['size'] < 1 ) {
+			$errors[] = __( 'Oops, you didn\'t select a file.', 'formidable' );
+			self::form($errors);
+			return;
+		}
 
-        $file = $_FILES['frm_import_file']['tmp_name'];
+		$file = $_FILES['frm_import_file']['tmp_name'];
 
-        if ( ! is_uploaded_file( $file ) ) {
-            unset($file);
-            $errors[] = __( 'The file does not exist, please try again.', 'formidable' );
-            self::form($errors);
-            return;
-        }
+		if ( ! is_uploaded_file( $file ) ) {
+			unset($file);
+			$errors[] = __( 'The file does not exist, please try again.', 'formidable' );
+			self::form($errors);
+			return;
+		}
 
-        //add_filter('upload_mimes', 'FrmXMLController::allow_mime');
+		//add_filter('upload_mimes', 'FrmXMLController::allow_mime');
 
-        $export_format = apply_filters('frm_export_formats', array(
+		$export_format = apply_filters('frm_export_formats', array(
 			'xml' => array( 'name' => 'XML', 'support' => 'forms', 'count' => 'multiple' ),
 		) );
 
-        $file_type = strtolower(pathinfo($_FILES['frm_import_file']['name'], PATHINFO_EXTENSION));
-        if ( $file_type != 'xml' && isset( $export_format[ $file_type ] ) ) {
-            // allow other file types to be imported
+		$file_type = strtolower(pathinfo($_FILES['frm_import_file']['name'], PATHINFO_EXTENSION));
+		if ( $file_type != 'xml' && isset( $export_format[ $file_type ] ) ) {
+			// allow other file types to be imported
 			do_action( 'frm_before_import_' . $file_type );
-            return;
-        }
-        unset($file_type);
+			return;
+		}
+		unset($file_type);
 
 		if ( ! function_exists( 'libxml_disable_entity_loader' ) ) {
 			$errors[] = __( 'XML import is not enabled on your server.', 'formidable' );
@@ -124,148 +124,148 @@ 
 		libxml_use_internal_errors( $set_err );
 		libxml_disable_entity_loader( $loader );
 
-        self::form($errors, $message);
-    }
+		self::form($errors, $message);
+	}
 
-    public static function export_xml() {
-        $error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'export-xml', 'export-xml-nonce' );
-        if ( ! empty($error) ) {
-            wp_die( $error );
-        }
+	public static function export_xml() {
+		$error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'export-xml', 'export-xml-nonce' );
+		if ( ! empty($error) ) {
+			wp_die( $error );
+		}
 
 		$ids = FrmAppHelper::get_post_param( 'frm_export_forms', array() );
 		$type = FrmAppHelper::get_post_param( 'type', array() );
 		$format = FrmAppHelper::get_post_param( 'format', 'xml', 'sanitize_title' );
 
-        if ( ! headers_sent() && ! $type ) {
-            wp_redirect( esc_url_raw( admin_url( 'admin.php?page=formidable-import' ) ) );
-            die();
-        }
+		if ( ! headers_sent() && ! $type ) {
+			wp_redirect( esc_url_raw( admin_url( 'admin.php?page=formidable-import' ) ) );
+			die();
+		}
 
-        if ( $format == 'xml' ) {
-            self::generate_xml($type, compact('ids'));
+		if ( $format == 'xml' ) {
+			self::generate_xml($type, compact('ids'));
 		} if ( $format == 'csv' ) {
 			self::generate_csv( compact('ids') );
-        } else {
+		} else {
 			do_action( 'frm_export_format_' . $format, compact('ids') );
-        }
+		}
 
-        wp_die();
-    }
+		wp_die();
+	}
 
 	public static function generate_xml( $type, $args = array() ) {
-    	global $wpdb;
+		global $wpdb;
 
-	    $type = (array) $type;
-        if ( in_array( 'items', $type) && ! in_array( 'forms', $type) ) {
-            // make sure the form is included if there are entries
-            $type[] = 'forms';
-        }
+		$type = (array) $type;
+		if ( in_array( 'items', $type) && ! in_array( 'forms', $type) ) {
+			// make sure the form is included if there are entries
+			$type[] = 'forms';
+		}
 
-	    if ( in_array( 'forms', $type) ) {
-            // include actions with forms
-	        $type[] = 'actions';
-	    }
+		if ( in_array( 'forms', $type) ) {
+			// include actions with forms
+			$type[] = 'actions';
+		}
 
-	    $tables = array(
+		$tables = array(
 			'items'     => $wpdb->prefix . 'frm_items',
 			'forms'     => $wpdb->prefix . 'frm_forms',
-	        'posts'     => $wpdb->posts,
-	        'styles'    => $wpdb->posts,
-	        'actions'   => $wpdb->posts,
-	    );
+			'posts'     => $wpdb->posts,
+			'styles'    => $wpdb->posts,
+			'actions'   => $wpdb->posts,
+		);
 
 		$defaults = array( 'ids' => false );
-	    $args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args( $args, $defaults );
 
-        $sitename = sanitize_key( get_bloginfo( 'name' ) );
+		$sitename = sanitize_key( get_bloginfo( 'name' ) );
 
-    	if ( ! empty( $sitename ) ) {
+		if ( ! empty( $sitename ) ) {
 			$sitename .= '.';
 		}
-    	$filename = $sitename . 'formidable.' . date( 'Y-m-d' ) . '.xml';
+		$filename = $sitename . 'formidable.' . date( 'Y-m-d' ) . '.xml';
 
-    	header( 'Content-Description: File Transfer' );
-    	header( 'Content-Disposition: attachment; filename=' . $filename );
-    	header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
+		header( 'Content-Description: File Transfer' );
+		header( 'Content-Disposition: attachment; filename=' . $filename );
+		header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
 
-        //make sure ids are numeric
-    	if ( is_array( $args['ids'] ) && ! empty( $args['ids'] ) ) {
-	        $args['ids'] = array_filter( $args['ids'], 'is_numeric' );
-	    }
+		//make sure ids are numeric
+		if ( is_array( $args['ids'] ) && ! empty( $args['ids'] ) ) {
+			$args['ids'] = array_filter( $args['ids'], 'is_numeric' );
+		}
 
-	    $records = array();
+		$records = array();
 
 		foreach ( $type as $tb_type ) {
-            $where = array();
+			$where = array();
 			$join = '';
-            $table = $tables[ $tb_type ];
+			$table = $tables[ $tb_type ];
 
 			$select = $table . '.id';
-            $query_vars = array();
+			$query_vars = array();
 
-            switch ( $tb_type ) {
-                case 'forms':
-                    //add forms
-                    if ( $args['ids'] ) {
+			switch ( $tb_type ) {
+				case 'forms':
+					//add forms
+					if ( $args['ids'] ) {
 						$where[] = array( 'or' => 1, $table . '.id' => $args['ids'], $table . '.parent_form_id' => $args['ids'] );
-                	} else {
+					} else {
 						$where[ $table . '.status !' ] = 'draft';
-                	}
-                break;
-                case 'actions':
+					}
+				break;
+				case 'actions':
 					$select = $table . '.ID';
 					$where['post_type'] = FrmFormActionsController::$action_post_type;
-                    if ( ! empty($args['ids']) ) {
+					if ( ! empty($args['ids']) ) {
 						$where['menu_order'] = $args['ids'];
-                    }
-                break;
-                case 'items':
-                    //$join = "INNER JOIN {$wpdb->prefix}frm_item_metas im ON ($table.id = im.item_id)";
-                    if ( $args['ids'] ) {
+					}
+				break;
+				case 'items':
+					//$join = "INNER JOIN {$wpdb->prefix}frm_item_metas im ON ($table.id = im.item_id)";
+					if ( $args['ids'] ) {
 						$where[ $table . '.form_id' ] = $args['ids'];
-                    }
-                break;
-                case 'styles':
-                    // Loop through all exported forms and get their selected style IDs
-                    $form_ids = $args['ids'];
-                    $style_ids = array();
-                    foreach ( $form_ids as $form_id ) {
-                        $form_data = FrmForm::getOne( $form_id );
-                        // For forms that have not been updated while running 2.0, check if custom_style is set
-                        if ( isset( $form_data->options['custom_style'] ) ) {
-                            $style_ids[] = $form_data->options['custom_style'];
-                        }
-                        unset( $form_id, $form_data );
-                    }
+					}
+				break;
+				case 'styles':
+					// Loop through all exported forms and get their selected style IDs
+					$form_ids = $args['ids'];
+					$style_ids = array();
+					foreach ( $form_ids as $form_id ) {
+						$form_data = FrmForm::getOne( $form_id );
+						// For forms that have not been updated while running 2.0, check if custom_style is set
+						if ( isset( $form_data->options['custom_style'] ) ) {
+							$style_ids[] = $form_data->options['custom_style'];
+						}
+						unset( $form_id, $form_data );
+					}
 					$select = $table . '.ID';
-                    $where['post_type'] = 'frm_styles';
-
-                    // Only export selected styles
-                    if ( ! empty( $style_ids ) ) {
-                        $where['ID'] = $style_ids;
-                    }
-                break;
-                default:
+					$where['post_type'] = 'frm_styles';
+
+					// Only export selected styles
+					if ( ! empty( $style_ids ) ) {
+						$where['ID'] = $style_ids;
+					}
+				break;
+				default:
 					$select = $table . '.ID';
-                    $join = ' INNER JOIN ' . $wpdb->postmeta . ' pm ON (pm.post_id=' . $table . '.ID)';
-                    $where['pm.meta_key'] = 'frm_form_id';
-
-                    if ( empty($args['ids']) ) {
-                        $where['pm.meta_value >'] = 1;
-                    } else {
-                        $where['pm.meta_value'] = $args['ids'];
-                    }
-                break;
-            }
+					$join = ' INNER JOIN ' . $wpdb->postmeta . ' pm ON (pm.post_id=' . $table . '.ID)';
+					$where['pm.meta_key'] = 'frm_form_id';
+
+					if ( empty($args['ids']) ) {
+						$where['pm.meta_value >'] = 1;
+					} else {
+						$where['pm.meta_value'] = $args['ids'];
+					}
+				break;
+			}
 
 			$records[ $tb_type ] = FrmDb::get_col( $table . $join, $where, $select );
-            unset($tb_type);
-        }
+			unset($tb_type);
+		}
 
 		echo '<?xml version="1.0" encoding="' . esc_attr( get_bloginfo('charset') ) . "\" ?>\n";
 		include( FrmAppHelper::plugin_path() . '/classes/views/xml/xml.php' );
-    }
+	}
 
 
 	public static function generate_csv( $atts ) {
@@ -336,14 +336,14 @@ 
 	}
 
 	/**
-	* Get the fields that should be included in the CSV export
-	*
-	* @since 2.0.19
-	*
-	* @param int $form_id
-	* @param object $form
-	* @return array $csv_fields
-	*/
+	 * Get the fields that should be included in the CSV export
+	 *
+	 * @since 2.0.19
+	 *
+	 * @param int $form_id
+	 * @param object $form
+	 * @return array $csv_fields
+	 */
 	private static function get_fields_for_csv_export( $form_id, $form ) {
 		// Phase frm_csv_field_ids out by 2.01.05
 		$csv_field_ids = apply_filters( 'frm_csv_field_ids', '', $form_id, array( 'form' => $form ) );
@@ -373,16 +373,16 @@ 
 	}
 
 	public static function allow_mime( $mimes ) {
-        if ( ! isset( $mimes['csv'] ) ) {
-            // allow csv files
-            $mimes['csv'] = 'text/csv';
-        }
-
-        if ( ! isset( $mimes['xml'] ) ) {
-            // allow xml
-            $mimes['xml'] = 'text/xml';
-        }
-
-        return $mimes;
-    }
+		if ( ! isset( $mimes['csv'] ) ) {
+			// allow csv files
+			$mimes['csv'] = 'text/csv';
+		}
+
+		if ( ! isset( $mimes['xml'] ) ) {
+			// allow xml
+			$mimes['xml'] = 'text/xml';
+		}
+
+		return $mimes;
+	}
 }

Spacing +33 added lines, -33 removed lines

@@ -12,14 +12,14 @@ 
     		return;
     	}
 
-        $set_err = libxml_use_internal_errors(true);
+        $set_err = libxml_use_internal_errors( true );
         $loader = libxml_disable_entity_loader( true );
 
 		$files = apply_filters( 'frm_default_templates_files', array( FrmAppHelper::plugin_path() . '/classes/views/xml/default-templates.xml' ) );
 
         foreach ( (array) $files as $file ) {
-            FrmXMLHelper::import_xml($file);
-            unset($file);
+            FrmXMLHelper::import_xml( $file );
+            unset( $file );
         }
         /*
         if(is_wp_error($result))
@@ -71,41 +71,41 @@ 
         $errors = array();
         $message = '';
 
-        $permission_error = FrmAppHelper::permission_nonce_error('frm_edit_forms', 'import-xml', 'import-xml-nonce');
+        $permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'import-xml', 'import-xml-nonce' );
         if ( $permission_error !== false ) {
             $errors[] = $permission_error;
-            self::form($errors);
+            self::form( $errors );
             return;
         }
 
-        if ( ! isset($_FILES) || ! isset($_FILES['frm_import_file']) || empty($_FILES['frm_import_file']['name']) || (int) $_FILES['frm_import_file']['size'] < 1 ) {
+        if ( ! isset( $_FILES ) || ! isset( $_FILES['frm_import_file'] ) || empty( $_FILES['frm_import_file']['name'] ) || (int) $_FILES['frm_import_file']['size'] < 1 ) {
             $errors[] = __( 'Oops, you didn\'t select a file.', 'formidable' );
-            self::form($errors);
+            self::form( $errors );
             return;
         }
 
         $file = $_FILES['frm_import_file']['tmp_name'];
 
         if ( ! is_uploaded_file( $file ) ) {
-            unset($file);
+            unset( $file );
             $errors[] = __( 'The file does not exist, please try again.', 'formidable' );
-            self::form($errors);
+            self::form( $errors );
             return;
         }
 
         //add_filter('upload_mimes', 'FrmXMLController::allow_mime');
 
-        $export_format = apply_filters('frm_export_formats', array(
+        $export_format = apply_filters( 'frm_export_formats', array(
 			'xml' => array( 'name' => 'XML', 'support' => 'forms', 'count' => 'multiple' ),
 		) );
 
-        $file_type = strtolower(pathinfo($_FILES['frm_import_file']['name'], PATHINFO_EXTENSION));
-        if ( $file_type != 'xml' && isset( $export_format[ $file_type ] ) ) {
+        $file_type = strtolower( pathinfo( $_FILES['frm_import_file']['name'], PATHINFO_EXTENSION ) );
+        if ( $file_type != 'xml' && isset( $export_format[$file_type] ) ) {
             // allow other file types to be imported
 			do_action( 'frm_before_import_' . $file_type );
             return;
         }
-        unset($file_type);
+        unset( $file_type );
 
 		if ( ! function_exists( 'libxml_disable_entity_loader' ) ) {
 			$errors[] = __( 'XML import is not enabled on your server.', 'formidable' );
@@ -124,12 +124,12 @@ 
 		libxml_use_internal_errors( $set_err );
 		libxml_disable_entity_loader( $loader );
 
-        self::form($errors, $message);
+        self::form( $errors, $message );
     }
 
     public static function export_xml() {
         $error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'export-xml', 'export-xml-nonce' );
-        if ( ! empty($error) ) {
+        if ( ! empty( $error ) ) {
             wp_die( $error );
         }
 
@@ -143,11 +143,11 @@ 
         }
 
         if ( $format == 'xml' ) {
-            self::generate_xml($type, compact('ids'));
+            self::generate_xml( $type, compact( 'ids' ) );
 		} if ( $format == 'csv' ) {
-			self::generate_csv( compact('ids') );
+			self::generate_csv( compact( 'ids' ) );
         } else {
-			do_action( 'frm_export_format_' . $format, compact('ids') );
+			do_action( 'frm_export_format_' . $format, compact( 'ids' ) );
         }
 
         wp_die();
@@ -157,12 +157,12 @@ 
     	global $wpdb;
 
 	    $type = (array) $type;
-        if ( in_array( 'items', $type) && ! in_array( 'forms', $type) ) {
+        if ( in_array( 'items', $type ) && ! in_array( 'forms', $type ) ) {
             // make sure the form is included if there are entries
             $type[] = 'forms';
         }
 
-	    if ( in_array( 'forms', $type) ) {
+	    if ( in_array( 'forms', $type ) ) {
             // include actions with forms
 	        $type[] = 'actions';
 	    }
@@ -199,7 +199,7 @@ 
 		foreach ( $type as $tb_type ) {
             $where = array();
 			$join = '';
-            $table = $tables[ $tb_type ];
+            $table = $tables[$tb_type];
 
 			$select = $table . '.id';
             $query_vars = array();
@@ -210,20 +210,20 @@ 
                     if ( $args['ids'] ) {
 						$where[] = array( 'or' => 1, $table . '.id' => $args['ids'], $table . '.parent_form_id' => $args['ids'] );
                 	} else {
-						$where[ $table . '.status !' ] = 'draft';
+						$where[$table . '.status !'] = 'draft';
                 	}
                 break;
                 case 'actions':
 					$select = $table . '.ID';
 					$where['post_type'] = FrmFormActionsController::$action_post_type;
-                    if ( ! empty($args['ids']) ) {
+                    if ( ! empty( $args['ids'] ) ) {
 						$where['menu_order'] = $args['ids'];
                     }
                 break;
                 case 'items':
                     //$join = "INNER JOIN {$wpdb->prefix}frm_item_metas im ON ($table.id = im.item_id)";
                     if ( $args['ids'] ) {
-						$where[ $table . '.form_id' ] = $args['ids'];
+						$where[$table . '.form_id'] = $args['ids'];
                     }
                 break;
                 case 'styles':
@@ -251,7 +251,7 @@ 
                     $join = ' INNER JOIN ' . $wpdb->postmeta . ' pm ON (pm.post_id=' . $table . '.ID)';
                     $where['pm.meta_key'] = 'frm_form_id';
 
-                    if ( empty($args['ids']) ) {
+                    if ( empty( $args['ids'] ) ) {
                         $where['pm.meta_value >'] = 1;
                     } else {
                         $where['pm.meta_value'] = $args['ids'];
@@ -259,11 +259,11 @@ 
                 break;
             }
 
-			$records[ $tb_type ] = FrmDb::get_col( $table . $join, $where, $select );
-            unset($tb_type);
+			$records[$tb_type] = FrmDb::get_col( $table . $join, $where, $select );
+            unset( $tb_type );
         }
 
-		echo '<?xml version="1.0" encoding="' . esc_attr( get_bloginfo('charset') ) . "\" ?>\n";
+		echo '<?xml version="1.0" encoding="' . esc_attr( get_bloginfo( 'charset' ) ) . "\" ?>\n";
 		include( FrmAppHelper::plugin_path() . '/classes/views/xml/xml.php' );
     }
 
@@ -289,11 +289,11 @@ 
 			$fid = FrmAppHelper::get_param( 'fid', '', 'get', 'sanitize_text_field' );
 		}
 
-		if ( ! ini_get('safe_mode') ) {
-			set_time_limit(0); //Remove time limit to execute this function
-			$mem_limit = str_replace('M', '', ini_get('memory_limit'));
+		if ( ! ini_get( 'safe_mode' ) ) {
+			set_time_limit( 0 ); //Remove time limit to execute this function
+			$mem_limit = str_replace( 'M', '', ini_get( 'memory_limit' ) );
 			if ( (int) $mem_limit < 256 ) {
-				ini_set('memory_limit', '256M');
+				ini_set( 'memory_limit', '256M' );
 			}
 		}
 
@@ -364,7 +364,7 @@ 
 			$no_export_fields = FrmField::no_save_fields();
 			foreach ( $csv_fields as $k => $f ) {
 				if ( in_array( $f->type, $no_export_fields ) ) {
-					unset( $csv_fields[ $k ] );
+					unset( $csv_fields[$k] );
 				}
 			}
 		}