Strategy11 / formidable-forms

classes/models/FrmEntry.php

Doc Comments +4 added lines

@@ -180,6 +180,7 @@ 
 	*
 	* @param int $id
 	* @param array $values
+	* @param string $update_type
 	* @return boolean|int $query_results
 	*/
 	private static function update_entry( $id, $values, $update_type ) {
@@ -563,6 +564,9 @@ 
 		return $new_values;
 	}
 
+	/**
+	 * @param string $name
+	 */
 	private static function get_entry_value( $values, $name, $default ) {
 		return isset( $values[ $name ] ) ? $values[ $name ] : $default;
 	}

Indentation +354 added lines, -354 removed lines

@@ -6,11 +6,11 @@ 
 class FrmEntry {
 
 	/**
-	* Create a new entry
-	*
-	* @param array $values
-	* @return int | boolean $entry_id
-	*/
+	 * Create a new entry
+	 *
+	 * @param array $values
+	 * @return int | boolean $entry_id
+	 */
 	public static function create( $values ) {
 		$entry_id = self::create_entry( $values, 'standard' );
 
@@ -18,12 +18,12 @@ 
 	}
 
 	/**
-	* Create a new entry with some differences depending on type
-	*
-	* @param array $values
-	* @param string $type
-	* @return int | boolean $entry_id
-	*/
+	 * Create a new entry with some differences depending on type
+	 *
+	 * @param array $values
+	 * @param string $type
+	 * @return int | boolean $entry_id
+	 */
 	private static function create_entry( $values, $type ) {
 		$new_values = self::before_insert_entry_in_database( $values, $type );
 
@@ -37,10 +37,10 @@ 
 		return $entry_id;
 	}
 
-    /**
-     * check for duplicate entries created in the last minute
-     * @return boolean
-     */
+	/**
+	 * check for duplicate entries created in the last minute
+	 * @return boolean
+	 */
 	public static function is_duplicate( $new_values, $values ) {
 		$duplicate_entry_time = apply_filters( 'frm_time_to_check_duplicates', 60, $new_values );
 
@@ -48,55 +48,55 @@ 
 			return false;
 		}
 
-        $check_val = $new_values;
+		$check_val = $new_values;
 		$check_val['created_at >'] = date( 'Y-m-d H:i:s', ( strtotime( $new_values['created_at'] ) - absint( $duplicate_entry_time ) ) );
 
 		unset( $check_val['created_at'], $check_val['updated_at'] );
 		unset( $check_val['is_draft'], $check_val['id'], $check_val['item_key'] );
 
-        if ( $new_values['item_key'] == $new_values['name'] ) {
-            unset($check_val['name']);
-        }
+		if ( $new_values['item_key'] == $new_values['name'] ) {
+			unset($check_val['name']);
+		}
 
-        global $wpdb;
+		global $wpdb;
 		$entry_exists = FrmDb::get_col( $wpdb->prefix . 'frm_items', $check_val, 'id', array( 'order_by' => 'created_at DESC' ) );
 
-        if ( ! $entry_exists || empty($entry_exists) || ! isset($values['item_meta']) ) {
-            return false;
-        }
+		if ( ! $entry_exists || empty($entry_exists) || ! isset($values['item_meta']) ) {
+			return false;
+		}
 
-        $is_duplicate = false;
-        foreach ( $entry_exists as $entry_exist ) {
-            $is_duplicate = true;
+		$is_duplicate = false;
+		foreach ( $entry_exists as $entry_exist ) {
+			$is_duplicate = true;
 
-            //add more checks here to make sure it's a duplicate
-            $metas = FrmEntryMeta::get_entry_meta_info($entry_exist);
-            $field_metas = array();
-            foreach ( $metas as $meta ) {
+			//add more checks here to make sure it's a duplicate
+			$metas = FrmEntryMeta::get_entry_meta_info($entry_exist);
+			$field_metas = array();
+			foreach ( $metas as $meta ) {
 				$field_metas[ $meta->field_id ] = $meta->meta_value;
-            }
-
-            // If prev entry is empty and current entry is not, they are not duplicates
-            $filtered_vals = array_filter( $values['item_meta'] );
-            if ( empty( $field_metas ) && ! empty( $filtered_vals ) ) {
-                return false;
-            }
-
-            $diff = array_diff_assoc($field_metas, array_map('maybe_serialize', $values['item_meta']));
-            foreach ( $diff as $field_id => $meta_value ) {
-                if ( ! empty($meta_value) ) {
-                    $is_duplicate = false;
-                    continue;
-                }
-            }
-
-            if ( $is_duplicate ) {
+			}
+
+			// If prev entry is empty and current entry is not, they are not duplicates
+			$filtered_vals = array_filter( $values['item_meta'] );
+			if ( empty( $field_metas ) && ! empty( $filtered_vals ) ) {
+				return false;
+			}
+
+			$diff = array_diff_assoc($field_metas, array_map('maybe_serialize', $values['item_meta']));
+			foreach ( $diff as $field_id => $meta_value ) {
+				if ( ! empty($meta_value) ) {
+					$is_duplicate = false;
+					continue;
+				}
+			}
+
+			if ( $is_duplicate ) {
 				break;
-            }
-        }
+			}
+		}
 
-        return $is_duplicate;
-    }
+		return $is_duplicate;
+	}
 
 	/**
 	 * Determine if an entry needs to be checked as a possible duplicate
@@ -125,48 +125,48 @@ 
 		return true;
 	}
 
-    public static function duplicate( $id ) {
-        global $wpdb;
+	public static function duplicate( $id ) {
+		global $wpdb;
 
-        $values = self::getOne( $id );
+		$values = self::getOne( $id );
 
-        $new_values = array();
+		$new_values = array();
 		$new_values['item_key'] = FrmAppHelper::get_unique_key( '', $wpdb->prefix . 'frm_items', 'item_key' );
-        $new_values['name'] = $values->name;
-        $new_values['is_draft'] = $values->is_draft;
+		$new_values['name'] = $values->name;
+		$new_values['is_draft'] = $values->is_draft;
 		$new_values['user_id'] = (int) $values->user_id;
 		$new_values['updated_by'] = (int) $values->user_id;
-        $new_values['form_id'] = $values->form_id ? (int) $values->form_id: null;
+		$new_values['form_id'] = $values->form_id ? (int) $values->form_id: null;
 		$new_values['created_at'] = current_time( 'mysql', 1 );
 		$new_values['updated_at'] = $new_values['created_at'];
 
 		$query_results = $wpdb->insert( $wpdb->prefix . 'frm_items', $new_values );
-        if ( ! $query_results ) {
-            return false;
-        }
+		if ( ! $query_results ) {
+			return false;
+		}
 
-        $entry_id = $wpdb->insert_id;
+		$entry_id = $wpdb->insert_id;
 
-        global $frm_vars;
-        if ( ! isset($frm_vars['saved_entries']) ) {
-            $frm_vars['saved_entries'] = array();
-        }
-        $frm_vars['saved_entries'][] = (int) $entry_id;
+		global $frm_vars;
+		if ( ! isset($frm_vars['saved_entries']) ) {
+			$frm_vars['saved_entries'] = array();
+		}
+		$frm_vars['saved_entries'][] = (int) $entry_id;
 
-        FrmEntryMeta::duplicate_entry_metas($id, $entry_id);
+		FrmEntryMeta::duplicate_entry_metas($id, $entry_id);
 		self::clear_cache();
 
 		do_action( 'frm_after_duplicate_entry', $entry_id, $new_values['form_id'], array( 'old_id' => $id ) );
-        return $entry_id;
-    }
+		return $entry_id;
+	}
 
 	/**
-	* Update an entry (not via XML)
-	*
-	* @param int $id
-	* @param array $values
-	* @return boolean|int $update_results
-	*/
+	 * Update an entry (not via XML)
+	 *
+	 * @param int $id
+	 * @param array $values
+	 * @return boolean|int $update_results
+	 */
 	public static function update( $id, $values ) {
 		$update_results = self::update_entry( $id, $values, 'standard' );
 
@@ -174,14 +174,14 @@ 
 	}
 
 	/**
-	* Update an entry with some differences depending on the update type
-	*
-	* @since 2.0.16
-	*
-	* @param int $id
-	* @param array $values
-	* @return boolean|int $query_results
-	*/
+	 * Update an entry with some differences depending on the update type
+	 *
+	 * @since 2.0.16
+	 *
+	 * @param int $id
+	 * @param array $values
+	 * @return boolean|int $query_results
+	 */
 	private static function update_entry( $id, $values, $update_type ) {
 		global $wpdb;
 
@@ -200,34 +200,34 @@ 
 	}
 
 	public static function destroy( $id ) {
-        global $wpdb;
-        $id = (int) $id;
+		global $wpdb;
+		$id = (int) $id;
 
 		$entry = self::getOne( $id );
-        if ( ! $entry ) {
-            $result = false;
-            return $result;
-        }
+		if ( ! $entry ) {
+			$result = false;
+			return $result;
+		}
 
-        do_action('frm_before_destroy_entry', $id, $entry);
+		do_action('frm_before_destroy_entry', $id, $entry);
 
 		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_item_metas WHERE item_id=%d', $id ) );
 		$result = $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_items WHERE id=%d', $id ) );
 
 		self::clear_cache();
 
-        return $result;
-    }
+		return $result;
+	}
 
 	public static function update_form( $id, $value, $form_id ) {
-        global $wpdb;
-        $form_id = isset($value) ? $form_id : null;
+		global $wpdb;
+		$form_id = isset($value) ? $form_id : null;
 		$result = $wpdb->update( $wpdb->prefix . 'frm_items', array( 'form_id' => $form_id ), array( 'id' => $id ) );
 		if ( $result ) {
 			self::clear_cache();
 		}
-        return $result;
-    }
+		return $result;
+	}
 
 	/**
 	 * Clear entry caching
@@ -263,159 +263,159 @@ 
 	}
 
 	public static function getOne( $id, $meta = false ) {
-        global $wpdb;
+		global $wpdb;
 
-        $query = "SELECT it.*, fr.name as form_name, fr.form_key as form_key FROM {$wpdb->prefix}frm_items it
+		$query = "SELECT it.*, fr.name as form_name, fr.form_key as form_key FROM {$wpdb->prefix}frm_items it
                   LEFT OUTER JOIN {$wpdb->prefix}frm_forms fr ON it.form_id=fr.id WHERE ";
 
-        $query .= is_numeric($id) ? 'it.id=%d' : 'it.item_key=%s';
-        $query_args = array( $id );
-        $query = $wpdb->prepare( $query, $query_args );
+		$query .= is_numeric($id) ? 'it.id=%d' : 'it.item_key=%s';
+		$query_args = array( $id );
+		$query = $wpdb->prepare( $query, $query_args );
 
-        if ( ! $meta ) {
+		if ( ! $meta ) {
 			$entry = FrmAppHelper::check_cache( $id . '_nometa', 'frm_entry', $query, 'get_row' );
-            return stripslashes_deep($entry);
-        }
+			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, array( 'form_id' => $entry->form_id ) );
-        foreach ( $metas as $meta_val ) {
-            if ( $meta_val->item_id == $entry->id ) {
+		foreach ( $metas as $meta_val ) {
+			if ( $meta_val->item_id == $entry->id ) {
 				$entry->metas[ $meta_val->field_id ] = maybe_unserialize( $meta_val->meta_value );
 				if ( $include_key ) {
 					$entry->metas[ $meta_val->field_key ] = $entry->metas[ $meta_val->field_id ];
 				}
-                 continue;
-            }
+				 continue;
+			}
 
-            // include sub entries in an array
+			// include sub entries in an array
 			if ( ! isset( $entry_metas[ $meta_val->field_id ] ) ) {
 				$entry->metas[ $meta_val->field_id ] = array();
-            }
+			}
 
 			$entry->metas[ $meta_val->field_id ][] = maybe_unserialize( $meta_val->meta_value );
 
-            unset($meta_val);
-        }
-        unset($metas);
+			unset($meta_val);
+		}
+		unset($metas);
 
 		FrmAppHelper::set_cache( $entry->id, $entry, 'frm_entry' );
 
-        return $entry;
-    }
+		return $entry;
+	}
 
-    /**
-     * @param string $id
-     */
+	/**
+	 * @param string $id
+	 */
 	public static function exists( $id ) {
-        global $wpdb;
-
-        if ( FrmAppHelper::check_cache( $id, 'frm_entry' ) ) {
-            $exists = true;
-            return $exists;
-        }
-
-        if ( is_numeric($id) ) {
-            $where = array( 'id' => $id );
-        } else {
-            $where = array( 'item_key' => $id );
-        }
+		global $wpdb;
+
+		if ( 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 );
 
-        $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';
+		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);
 
 			FrmAppHelper::set_cache( $cache_key, $entries, 'frm_entry' );
-        }
+		}
 
-        if ( ! $meta || ! $entries ) {
-            return stripslashes_deep($entries);
-        }
-        unset($meta);
+		if ( ! $meta || ! $entries ) {
+			return stripslashes_deep($entries);
+		}
+		unset($meta);
 
-        if ( ! is_array( $where ) && preg_match('/^it\.form_id=\d+$/', $where) ) {
+		if ( ! is_array( $where ) && preg_match('/^it\.form_id=\d+$/', $where) ) {
 			$where = array( 'it.form_id' => substr( $where, 11 ) );
-        }
+		}
 
-        $meta_where = array( 'field_id !' => 0 );
-        if ( $limit == '' && is_array($where) && count($where) == 1 && isset($where['it.form_id']) ) {
-            $meta_where['fi.form_id'] = $where['it.form_id'];
-        } else {
-            $meta_where['item_id'] = array_keys( $entries );
-        }
+		$meta_where = array( 'field_id !' => 0 );
+		if ( $limit == '' && is_array($where) && count($where) == 1 && isset($where['it.form_id']) ) {
+			$meta_where['fi.form_id'] = $where['it.form_id'];
+		} else {
+			$meta_where['item_id'] = array_keys( $entries );
+		}
 
-        $metas = FrmDb::get_results( $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON (it.field_id = fi.id)', $meta_where, 'item_id, meta_value, field_id, field_key, form_id' );
+		$metas = FrmDb::get_results( $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON (it.field_id = fi.id)', $meta_where, 'item_id, meta_value, field_id, field_key, form_id' );
 
-        unset( $meta_where );
+		unset( $meta_where );
 
-        if ( ! $metas ) {
-            return stripslashes_deep($entries);
-        }
+		if ( ! $metas ) {
+			return stripslashes_deep($entries);
+		}
 
-        foreach ( $metas as $m_key => $meta_val ) {
-            if ( ! isset( $entries[ $meta_val->item_id ] ) ) {
-                continue;
-            }
+		foreach ( $metas as $m_key => $meta_val ) {
+			if ( ! isset( $entries[ $meta_val->item_id ] ) ) {
+				continue;
+			}
 
-            if ( ! isset( $entries[ $meta_val->item_id ]->metas ) ) {
+			if ( ! isset( $entries[ $meta_val->item_id ]->metas ) ) {
 				$entries[ $meta_val->item_id ]->metas = array();
-            }
+			}
 
 			$entries[ $meta_val->item_id ]->metas[ $meta_val->field_id ] = maybe_unserialize( $meta_val->meta_value );
 
-            unset($m_key, $meta_val);
-        }
+			unset($m_key, $meta_val);
+		}
 
 		if ( ! FrmAppHelper::prevent_caching() ) {
 			foreach ( $entries as $entry ) {
@@ -424,31 +424,31 @@ 
 			}
 		}
 
-        return stripslashes_deep($entries);
-    }
+		return stripslashes_deep($entries);
+	}
 
-    // Pagination Methods
-    public static function getRecordCount( $where = '' ) {
-        global $wpdb;
+	// Pagination Methods
+	public static function getRecordCount( $where = '' ) {
+		global $wpdb;
 		$table_join = $wpdb->prefix . 'frm_items it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fr ON it.form_id=fr.id';
 
-        if ( is_numeric($where) ) {
-            $table_join = 'frm_items';
-            $where = array( 'form_id' => $where );
-        }
+		if ( is_numeric($where) ) {
+			$table_join = 'frm_items';
+			$where = array( 'form_id' => $where );
+		}
 
-        if ( is_array( $where ) ) {
-            $count = FrmDb::get_count( $table_join, $where );
-        } else {
+		if ( is_array( $where ) ) {
+			$count = FrmDb::get_count( $table_join, $where );
+		} else {
 			$cache_key = 'count_' . maybe_serialize( $where );
 			$query = 'SELECT COUNT(*) FROM ' . $table_join . FrmAppHelper::prepend_and_or_where( ' WHERE ', $where );
 			$count = FrmAppHelper::check_cache( $cache_key, 'frm_entry', $query, 'get_var' );
-        }
+		}
 
-        return $count;
-    }
+		return $count;
+	}
 
-    public static function getPageCount( $p_size, $where = '' ) {
+	public static function getPageCount( $p_size, $where = '' ) {
 		$p_size = (int) $p_size;
 		$count = 1;
 		if ( $p_size ) {
@@ -459,16 +459,16 @@ 
 		}
 
 		return $count;
-    }
+	}
 
 	/**
-	* Prepare the data before inserting it into the database
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @param string $type
-	* @return array $new_values
-	*/
+	 * Prepare the data before inserting it into the database
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @param string $type
+	 * @return array $new_values
+	 */
 	private static function before_insert_entry_in_database( &$values, $type ) {
 
 		self::sanitize_entry_post( $values );
@@ -483,13 +483,13 @@ 
 	}
 
 	/**
-	* Create an entry and perform after create actions
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @param array $new_values
-	* @return boolean|int $entry_id
-	*/
+	 * Create an entry and perform after create actions
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @param array $new_values
+	 * @return boolean|int $entry_id
+	 */
 	private static function continue_to_create_entry( $values, $new_values ) {
 		$entry_id = self::insert_entry_into_database( $new_values );
 		if ( ! $entry_id ) {
@@ -501,37 +501,37 @@ 
 		return $entry_id;
 	}
 
-    /**
-     * Sanitize the POST values before we use them
-     *
-     * @since 2.0
-     * @param array $values The POST values by reference
-     */
-    public static function sanitize_entry_post( &$values ) {
-        $sanitize_method = array(
-            'form_id'       => 'absint',
-            'frm_action'    => 'sanitize_title',
-            'form_key'      => 'sanitize_title',
-            'item_key'      => 'sanitize_title',
-            'item_name'     => 'sanitize_text_field',
-            'frm_saving_draft' => 'absint',
-            'is_draft'      => 'absint',
-            'post_id'       => 'absint',
-            'parent_item_id' => 'absint',
-            'created_at'    => 'sanitize_text_field',
-            'updated_at'    => 'sanitize_text_field',
-        );
-
-        FrmAppHelper::sanitize_request( $sanitize_method, $values );
-    }
+	/**
+	 * Sanitize the POST values before we use them
+	 *
+	 * @since 2.0
+	 * @param array $values The POST values by reference
+	 */
+	public static function sanitize_entry_post( &$values ) {
+		$sanitize_method = array(
+			'form_id'       => 'absint',
+			'frm_action'    => 'sanitize_title',
+			'form_key'      => 'sanitize_title',
+			'item_key'      => 'sanitize_title',
+			'item_name'     => 'sanitize_text_field',
+			'frm_saving_draft' => 'absint',
+			'is_draft'      => 'absint',
+			'post_id'       => 'absint',
+			'parent_item_id' => 'absint',
+			'created_at'    => 'sanitize_text_field',
+			'updated_at'    => 'sanitize_text_field',
+		);
+
+		FrmAppHelper::sanitize_request( $sanitize_method, $values );
+	}
 
 	/**
-	* Prepare the new values for inserting into the database
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return array $new_values
-	*/
+	 * Prepare the new values for inserting into the database
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return array $new_values
+	 */
 	private static function package_entry_data( &$values ) {
 		global $wpdb;
 
@@ -584,34 +584,34 @@ 
 	}
 
 	/**
-	* Get the is_draft value for a new entry
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return int
-	*/
+	 * Get the is_draft value for a new entry
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return int
+	 */
 	private static function get_is_draft_value( $values ) {
 		return ( ( isset( $values['frm_saving_draft'] ) && $values['frm_saving_draft'] == 1 ) || ( isset( $values['is_draft'] ) && $values['is_draft'] == 1 ) ) ? 1 : 0;
 	}
 
 	/**
-	* Get the created_at value for a new entry
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return string
-	*/
+	 * Get the created_at value for a new entry
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return string
+	 */
 	private static function get_created_at( $values ) {
 		return self::get_entry_value( $values, 'created_at', current_time( 'mysql', 1 ) );
 	}
 
 	/**
-	* Get the updated_at value for a new entry
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return string
-	*/
+	 * Get the updated_at value for a new entry
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return string
+	 */
 	private static function get_updated_at( $values ) {
 		if ( isset( $values['updated_at'] ) ) {
 			$updated_at = $values['updated_at'];
@@ -623,12 +623,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'] );
@@ -643,12 +643,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'];
@@ -661,12 +661,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;
 
@@ -682,11 +682,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;
 
@@ -698,12 +698,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'] );
@@ -711,12 +711,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' );
@@ -726,13 +726,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 );
@@ -745,14 +745,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;
 
@@ -770,13 +770,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;
 
@@ -810,14 +810,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();
@@ -839,13 +839,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' );
 
@@ -853,28 +853,28 @@ 
 	}
 
 	/**
-	* Update entry from an XML import
-	* Certain actions aren't necessary when importing (like saving sub entries and modifying other vals)
-	*
-	* @since 2.0.16
-	* @param int $id
-	* @param array $values
-	* @return int | boolean $updated
-	*/
+	 * Update entry from an XML import
+	 * Certain actions aren't necessary when importing (like saving sub entries and modifying other vals)
+	 *
+	 * @since 2.0.16
+	 * @param int $id
+	 * @param array $values
+	 * @return int | boolean $updated
+	 */
 	public static function update_entry_from_xml( $id, $values ) {
 		$updated = self::update_entry( $id, $values, 'xml' );
 
 		return $updated;
 	}
 
-    /**
-     * @param string $key
-     * @return int entry_id
-     */
+	/**
+	 * @param string $key
+	 * @return int entry_id
+	 */
 	public static function get_id_by_key( $key ) {
-        $entry_id = FrmDb::get_var( 'frm_items', array( 'item_key' => sanitize_title( $key ) ) );
-        return $entry_id;
-    }
+		$entry_id = FrmDb::get_var( 'frm_items', array( 'item_key' => sanitize_title( $key ) ) );
+		return $entry_id;
+	}
 
 	public static function validate( $values, $exclude = false ) {
 		_deprecated_function( __FUNCTION__, '2.0.9', 'FrmEntryValidate::validate' );

Spacing +63 added lines, -63 removed lines

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

classes/views/frm-settings/license_box.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<div class="general_settings metabox-holder tabs-panel frm_license_box <?php echo ($a == 'general_settings') ? 'frm_block' : 'frm_hidden'; ?>">
+<div class="general_settings metabox-holder tabs-panel frm_license_box <?php echo ( $a == 'general_settings' ) ? 'frm_block' : 'frm_hidden'; ?>">
 <?php if ( ! is_multisite() || current_user_can( 'setup_network' ) ) { ?>
     <div class="postbox">
         <div class="inside">

classes/helpers/FrmXMLHelper.php

Indentation +506 added lines, -506 removed lines

@@ -23,30 +23,30 @@ 
 	}
 
 	public static function import_xml( $file ) {
-        $defaults = array(
-            'forms' => 0, 'fields' => 0, 'terms' => 0,
-            'posts' => 0, 'views' => 0, 'actions' => 0,
-            'styles' => 0,
-        );
-
-        $imported = array(
-            'imported' => $defaults,
+		$defaults = array(
+			'forms' => 0, 'fields' => 0, 'terms' => 0,
+			'posts' => 0, 'views' => 0, 'actions' => 0,
+			'styles' => 0,
+		);
+
+		$imported = array(
+			'imported' => $defaults,
 			'updated'  => $defaults,
 			'forms'    => array(),
 			'terms'    => array(),
-        );
+		);
 
-        unset($defaults);
+		unset($defaults);
 
 		if ( ! defined( 'WP_IMPORTING' ) ) {
-            define('WP_IMPORTING', true);
-        }
+			define('WP_IMPORTING', true);
+		}
 
 		if ( ! class_exists( 'DOMDocument' ) ) {
-            return new WP_Error( 'SimpleXML_parse_error', __( 'Your server does not have XML enabled', 'formidable' ), libxml_get_errors() );
-        }
+			return new WP_Error( 'SimpleXML_parse_error', __( 'Your server does not have XML enabled', 'formidable' ), libxml_get_errors() );
+		}
 
-        $dom = new DOMDocument;
+		$dom = new DOMDocument;
 		$success = $dom->loadXML( file_get_contents( $file ) );
 		if ( ! $success ) {
 			return new WP_Error( 'SimpleXML_parse_error', __( 'There was an error when reading this XML file', 'formidable' ), libxml_get_errors() );
@@ -64,45 +64,45 @@ 
 			return new WP_Error( 'SimpleXML_parse_error', __( 'There was an error when reading this XML file', 'formidable' ), libxml_get_errors() );
 		}
 
-        // add terms, forms (form and field ids), posts (post ids), and entries to db, in that order
+		// add terms, forms (form and field ids), posts (post ids), and entries to db, in that order
 		foreach ( array( 'term', 'form', 'view' ) as $item_type ) {
-            // grab cats, tags, and terms, or forms or posts
-            if ( isset($xml->{$item_type} ) ) {
+			// grab cats, tags, and terms, or forms or posts
+			if ( isset($xml->{$item_type} ) ) {
 				$function_name = 'import_xml_' . $item_type . 's';
 				$imported = self::$function_name( $xml->{$item_type}, $imported );
 				unset( $function_name, $xml->{$item_type} );
-            }
-        }
+			}
+		}
 
-	    $return = apply_filters('frm_importing_xml', $imported, $xml );
+		$return = apply_filters('frm_importing_xml', $imported, $xml );
 
-	    return $return;
-    }
+		return $return;
+	}
 
 	public static function import_xml_terms( $terms, $imported ) {
-        foreach ( $terms as $t ) {
+		foreach ( $terms as $t ) {
 			if ( term_exists( (string) $t->term_slug, (string) $t->term_taxonomy ) ) {
-			    continue;
+				continue;
 			}
 
 			$parent = self::get_term_parent_id( $t );
 
 			$term = wp_insert_term( (string) $t->term_name, (string) $t->term_taxonomy, array(
-                'slug'          => (string) $t->term_slug,
-                'description'   => (string) $t->term_description,
+				'slug'          => (string) $t->term_slug,
+				'description'   => (string) $t->term_description,
 				'parent'        => empty( $parent ) ? 0 : $parent,
-            ));
+			));
 
 			if ( $term && is_array( $term ) ) {
-                $imported['imported']['terms']++;
+				$imported['imported']['terms']++;
 				$imported['terms'][ (int) $t->term_id ] = $term['term_id'];
-            }
+			}
 
 			unset( $term, $t );
 		}
 
 		return $imported;
-    }
+	}
 
 	/**
 	 * @since 2.0.8
@@ -127,11 +127,11 @@ 
 		self::put_child_forms_first( $forms );
 
 		foreach ( $forms as $item ) {
-            $form = self::fill_form( $item );
+			$form = self::fill_form( $item );
 
 			self::update_custom_style_setting_on_import( $form );
 
-	        $this_form = self::maybe_get_form( $form );
+			$this_form = self::maybe_get_form( $form );
 
 			$old_id = false;
 			$form_fields = false;
@@ -143,35 +143,35 @@ 
 				$form_fields = self::get_form_fields( $form_id );
 			} else {
 				$form_id = FrmForm::create( $form );
-		        if ( $form_id ) {
-		            $imported['imported']['forms']++;
-		            // Keep track of whether this specific form was updated or not
+				if ( $form_id ) {
+					$imported['imported']['forms']++;
+					// Keep track of whether this specific form was updated or not
 					$imported['form_status'][ $form_id ] = 'imported';
 					self::track_imported_child_forms( (int) $form_id, $form['parent_form_id'], $child_forms );
-		        }
+				}
 			}
 
 			self::import_xml_fields( $item->field, $form_id, $this_form, $form_fields, $imported );
 
 			self::delete_removed_fields( $form_fields );
 
-		    // Update field ids/keys to new ones
+			// Update field ids/keys to new ones
 			do_action( 'frm_after_duplicate_form', $form_id, $form, array( 'old_id' => $old_id ) );
 
 			$imported['forms'][ (int) $item->id ] = $form_id;
 
-            // Send pre 2.0 form options through function that creates actions
-            self::migrate_form_settings_to_actions( $form['options'], $form_id, $imported, true );
+			// Send pre 2.0 form options through function that creates actions
+			self::migrate_form_settings_to_actions( $form['options'], $form_id, $imported, true );
 
 			do_action( 'frm_after_import_form', $form_id, $form );
 
-		    unset($form, $item);
+			unset($form, $item);
 		}
 
 		self::maybe_update_child_form_parent_id( $imported['forms'], $child_forms );
 
 		return $imported;
-    }
+	}
 
 	private static function fill_form( $item ) {
 		$form = array(
@@ -239,11 +239,11 @@ 
 	}
 
 	/**
-	* Put child forms first so they will be imported before parents
-	*
-	* @since 2.0.16
-	* @param array $forms
-	*/
+	 * Put child forms first so they will be imported before parents
+	 *
+	 * @since 2.0.16
+	 * @param array $forms
+	 */
 	private static function put_child_forms_first( &$forms ) {
 		$child_forms = array();
 		$regular_forms = array();
@@ -262,13 +262,13 @@ 
 	}
 
 	/**
-	* Keep track of all imported child forms
-	*
-	* @since 2.0.16
-	* @param int $form_id
-	* @param int $parent_form_id
-	* @param array $child_forms
-	*/
+	 * Keep track of all imported child forms
+	 *
+	 * @since 2.0.16
+	 * @param int $form_id
+	 * @param int $parent_form_id
+	 * @param array $child_forms
+	 */
 	private static function track_imported_child_forms( $form_id, $parent_form_id, &$child_forms ) {
 		if ( $parent_form_id ) {
 			$child_forms[ $form_id ] = $parent_form_id;
@@ -276,13 +276,13 @@ 
 	}
 
 	/**
-	* Update the parent_form_id on imported child forms
-	* Child forms are imported first so their parent_form_id will need to be updated after the parent is imported
-	*
-	* @since 2.0.6
-	* @param array $imported_forms
-	* @param array $child_forms
-	*/
+	 * Update the parent_form_id on imported child forms
+	 * Child forms are imported first so their parent_form_id will need to be updated after the parent is imported
+	 *
+	 * @since 2.0.6
+	 * @param array $imported_forms
+	 * @param array $child_forms
+	 */
 	private static function maybe_update_child_form_parent_id( $imported_forms, $child_forms ) {
 		foreach ( $child_forms as $child_form_id => $old_parent_form_id ) {
 
@@ -296,28 +296,28 @@ 
 	}
 
 	/**
-	* Import all fields for a form
-	* @since 2.0.13
-	*
-	* TODO: Cut down on params
-	*/
+	 * Import all fields for a form
+	 * @since 2.0.13
+	 *
+	 * TODO: Cut down on params
+	 */
 	private static function import_xml_fields( $xml_fields, $form_id, $this_form, &$form_fields, &$imported ) {
 		$in_section = 0;
 
 		foreach ( $xml_fields as $field ) {
 			$f = self::fill_field( $field, $form_id );
 
-		    if ( is_array($f['default_value']) && in_array($f['type'], array(
-		        'text', 'email', 'url', 'textarea',
-		        'number','phone', 'date',
-		        'hidden', 'password', 'tag', 'image',
-		    )) ) {
-		        if ( count($f['default_value']) === 1 ) {
+			if ( is_array($f['default_value']) && in_array($f['type'], array(
+				'text', 'email', 'url', 'textarea',
+				'number','phone', 'date',
+				'hidden', 'password', 'tag', 'image',
+			)) ) {
+				if ( count($f['default_value']) === 1 ) {
 					$f['default_value'] = '[' . reset( $f['default_value'] ) . ']';
-		        } else {
-		            $f['default_value'] = reset($f['default_value']);
-		        }
-		    }
+				} else {
+					$f['default_value'] = reset($f['default_value']);
+				}
+			}
 
 			self::maybe_update_in_section_variable( $in_section, $f );
 			self::maybe_update_form_select( $f, $imported );
@@ -396,12 +396,12 @@ 
 	}
 
 	/**
-	* Switch the form_select on a repeating field or embedded form if it needs to be switched
-	*
-	* @since 2.0.16
-	* @param array $f
-	* @param array $imported
-	*/
+	 * Switch the form_select on a repeating field or embedded form if it needs to be switched
+	 *
+	 * @since 2.0.16
+	 * @param array $f
+	 * @param array $imported
+	 */
 	private static function maybe_update_form_select( &$f, $imported ) {
 		if ( ! isset( $imported['forms'] ) ) {
 			return;
@@ -453,13 +453,13 @@ 
 	}
 
 	/**
-	* Updates the custom style setting on import
-	* Convert the post slug to an ID
-	*
-	* @since 2.0.19
-	* @param array $form
-	*
-	*/
+	 * Updates the custom style setting on import
+	 * Convert the post slug to an ID
+	 *
+	 * @since 2.0.19
+	 * @param array $form
+	 *
+	 */
 	private static function update_custom_style_setting_on_import( &$form ) {
 		if ( ! isset( $form['options']['custom_style'] ) ) {
 			return;
@@ -513,16 +513,16 @@ 
 	}
 
 	public static function import_xml_views( $views, $imported ) {
-        $imported['posts'] = array();
-        $form_action_type = FrmFormActionsController::$action_post_type;
+		$imported['posts'] = array();
+		$form_action_type = FrmFormActionsController::$action_post_type;
 
-        $post_types = array(
-            'frm_display' => 'views',
-            $form_action_type => 'actions',
-            'frm_styles'    => 'styles',
-        );
+		$post_types = array(
+			'frm_display' => 'views',
+			$form_action_type => 'actions',
+			'frm_styles'    => 'styles',
+		);
 
-        foreach ( $views as $item ) {
+		foreach ( $views as $item ) {
 			$post = array(
 				'post_title'    => (string) $item->title,
 				'post_name'     => (string) $item->post_name,
@@ -541,52 +541,52 @@ 
 				'post_date'     => (string) $item->post_date,
 				'post_date_gmt' => (string) $item->post_date_gmt,
 				'ping_status'   => (string) $item->ping_status,
-                'postmeta'      => array(),
-                'tax_input'     => array(),
+				'postmeta'      => array(),
+				'tax_input'     => array(),
 			);
 
-            $old_id = $post['post_id'];
-            self::populate_post($post, $item, $imported);
+			$old_id = $post['post_id'];
+			self::populate_post($post, $item, $imported);
 
 			unset($item);
 
 			$post_id = false;
-            if ( $post['post_type'] == $form_action_type ) {
-                $action_control = FrmFormActionsController::get_form_actions( $post['post_excerpt'] );
+			if ( $post['post_type'] == $form_action_type ) {
+				$action_control = FrmFormActionsController::get_form_actions( $post['post_excerpt'] );
 				if ( $action_control && is_object( $action_control ) ) {
 					$post_id = $action_control->maybe_create_action( $post, $imported['form_status'] );
 				}
-                unset($action_control);
-            } else if ( $post['post_type'] == 'frm_styles' ) {
-                // Properly encode post content before inserting the post
-                $post['post_content'] = FrmAppHelper::maybe_json_decode( $post['post_content'] );
+				unset($action_control);
+			} else if ( $post['post_type'] == 'frm_styles' ) {
+				// Properly encode post content before inserting the post
+				$post['post_content'] = FrmAppHelper::maybe_json_decode( $post['post_content'] );
 				$custom_css = isset( $post['post_content']['custom_css'] ) ? $post['post_content']['custom_css'] : '';
-                $post['post_content'] = FrmAppHelper::prepare_and_encode( $post['post_content'] );
+				$post['post_content'] = FrmAppHelper::prepare_and_encode( $post['post_content'] );
 
-                // Create/update post now
-                $post_id = wp_insert_post( $post );
+				// Create/update post now
+				$post_id = wp_insert_post( $post );
 				self::maybe_update_custom_css( $custom_css );
-            } else {
-                // Create/update post now
-                $post_id = wp_insert_post( $post );
-            }
+			} else {
+				// Create/update post now
+				$post_id = wp_insert_post( $post );
+			}
 
-            if ( ! is_numeric($post_id) ) {
-                continue;
-            }
+			if ( ! is_numeric($post_id) ) {
+				continue;
+			}
 
-            self::update_postmeta($post, $post_id);
+			self::update_postmeta($post, $post_id);
 
-            $this_type = 'posts';
+			$this_type = 'posts';
 			if ( isset( $post_types[ $post['post_type'] ] ) ) {
 				$this_type = $post_types[ $post['post_type'] ];
-            }
+			}
 
-            if ( isset($post['ID']) && $post_id == $post['ID'] ) {
-                $imported['updated'][ $this_type ]++;
-            } else {
-                $imported['imported'][ $this_type ]++;
-            }
+			if ( isset($post['ID']) && $post_id == $post['ID'] ) {
+				$imported['updated'][ $this_type ]++;
+			} else {
+				$imported['imported'][ $this_type ]++;
+			}
 
 			$imported['posts'][ (int) $old_id ] = $post_id;
 
@@ -598,16 +598,16 @@ 
 		self::maybe_update_stylesheet( $imported );
 
 		return $imported;
-    }
+	}
 
-    private static function populate_post( &$post, $item, $imported ) {
+	private static function populate_post( &$post, $item, $imported ) {
 		if ( isset($item->attachment_url) ) {
 			$post['attachment_url'] = (string) $item->attachment_url;
 		}
 
 		if ( $post['post_type'] == FrmFormActionsController::$action_post_type && isset( $imported['forms'][ (int) $post['menu_order'] ] ) ) {
-		    // update to new form id
-		    $post['menu_order'] = $imported['forms'][ (int) $post['menu_order'] ];
+			// update to new form id
+			$post['menu_order'] = $imported['forms'][ (int) $post['menu_order'] ];
 		}
 
 		// Don't allow default styles to take over a site's default style
@@ -616,144 +616,144 @@ 
 		}
 
 		foreach ( $item->postmeta as $meta ) {
-		    self::populate_postmeta($post, $meta, $imported);
+			self::populate_postmeta($post, $meta, $imported);
 			unset($meta);
 		}
 
-        self::populate_taxonomies($post, $item);
+		self::populate_taxonomies($post, $item);
 
-        self::maybe_editing_post($post);
-    }
+		self::maybe_editing_post($post);
+	}
 
-    private static function populate_postmeta( &$post, $meta, $imported ) {
-        global $frm_duplicate_ids;
+	private static function populate_postmeta( &$post, $meta, $imported ) {
+		global $frm_duplicate_ids;
 
-	    $m = array(
+		$m = array(
 			'key'   => (string) $meta->meta_key,
 			'value' => (string) $meta->meta_value,
 		);
 
 		//switch old form and field ids to new ones
 		if ( $m['key'] == 'frm_form_id' && isset($imported['forms'][ (int) $m['value'] ]) ) {
-		    $m['value'] = $imported['forms'][ (int) $m['value'] ];
+			$m['value'] = $imported['forms'][ (int) $m['value'] ];
 		} else {
-		    $m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
+			$m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
 
-		    if ( ! empty($frm_duplicate_ids) ) {
+			if ( ! empty($frm_duplicate_ids) ) {
 
-		        if ( $m['key'] == 'frm_dyncontent' ) {
-		            $m['value'] = FrmFieldsHelper::switch_field_ids($m['value']);
-    		    } else if ( $m['key'] == 'frm_options' ) {
+				if ( $m['key'] == 'frm_dyncontent' ) {
+					$m['value'] = FrmFieldsHelper::switch_field_ids($m['value']);
+				} else if ( $m['key'] == 'frm_options' ) {
 
 					foreach ( array( 'date_field_id', 'edate_field_id' ) as $setting_name ) {
 						if ( isset( $m['value'][ $setting_name ] ) && is_numeric( $m['value'][ $setting_name ] ) && isset( $frm_duplicate_ids[ $m['value'][ $setting_name ] ] ) ) {
 							$m['value'][ $setting_name ] = $frm_duplicate_ids[ $m['value'][ $setting_name ] ];
-    		            }
-    		        }
-
-                    $check_dup_array = array();
-    		        if ( isset( $m['value']['order_by'] ) && ! empty( $m['value']['order_by'] ) ) {
-    		            if ( is_numeric( $m['value']['order_by'] ) && isset( $frm_duplicate_ids[ $m['value']['order_by'] ] ) ) {
-    		                $m['value']['order_by'] = $frm_duplicate_ids[ $m['value']['order_by'] ];
-    		            } else if ( is_array( $m['value']['order_by'] ) ) {
-                            $check_dup_array[] = 'order_by';
-    		            }
-    		        }
-
-    		        if ( isset( $m['value']['where'] ) && ! empty( $m['value']['where'] ) ) {
-    		            $check_dup_array[] = 'where';
-    		        }
-
-                    foreach ( $check_dup_array as $check_k ) {
+						}
+					}
+
+					$check_dup_array = array();
+					if ( isset( $m['value']['order_by'] ) && ! empty( $m['value']['order_by'] ) ) {
+						if ( is_numeric( $m['value']['order_by'] ) && isset( $frm_duplicate_ids[ $m['value']['order_by'] ] ) ) {
+							$m['value']['order_by'] = $frm_duplicate_ids[ $m['value']['order_by'] ];
+						} else if ( is_array( $m['value']['order_by'] ) ) {
+							$check_dup_array[] = 'order_by';
+						}
+					}
+
+					if ( isset( $m['value']['where'] ) && ! empty( $m['value']['where'] ) ) {
+						$check_dup_array[] = 'where';
+					}
+
+					foreach ( $check_dup_array as $check_k ) {
 						foreach ( (array) $m['value'][ $check_k ] as $mk => $mv ) {
 							if ( isset( $frm_duplicate_ids[ $mv ] ) ) {
 								$m['value'][ $check_k ][ $mk ] = $frm_duplicate_ids[ $mv ];
-		                    }
-		                    unset($mk, $mv);
-		                }
-                    }
-    		    }
-		    }
+							}
+							unset($mk, $mv);
+						}
+					}
+				}
+			}
 		}
 
 		if ( ! is_array($m['value']) ) {
-		    $m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
+			$m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
 		}
 
 		$post['postmeta'][ (string) $meta->meta_key ] = $m['value'];
-    }
-
-    /**
-     * Add terms to post
-     * @param array $post by reference
-     * @param object $item The XML object data
-     */
-    private static function populate_taxonomies( &$post, $item ) {
+	}
+
+	/**
+	 * Add terms to post
+	 * @param array $post by reference
+	 * @param object $item The XML object data
+	 */
+	private static function populate_taxonomies( &$post, $item ) {
 		foreach ( $item->category as $c ) {
 			$att = $c->attributes();
 			if ( ! isset( $att['nicename'] ) ) {
-                continue;
-            }
-
-		    $taxonomy = (string) $att['domain'];
-		    if ( is_taxonomy_hierarchical($taxonomy) ) {
-		        $name = (string) $att['nicename'];
-		        $h_term = get_term_by('slug', $name, $taxonomy);
-		        if ( $h_term ) {
-		            $name = $h_term->term_id;
-		        }
-		        unset($h_term);
-		    } else {
-		        $name = (string) $c;
-		    }
+				continue;
+			}
+
+			$taxonomy = (string) $att['domain'];
+			if ( is_taxonomy_hierarchical($taxonomy) ) {
+				$name = (string) $att['nicename'];
+				$h_term = get_term_by('slug', $name, $taxonomy);
+				if ( $h_term ) {
+					$name = $h_term->term_id;
+				}
+				unset($h_term);
+			} else {
+				$name = (string) $c;
+			}
 
 			if ( ! isset( $post['tax_input'][ $taxonomy ] ) ) {
 				$post['tax_input'][ $taxonomy ] = array();
 			}
 
 			$post['tax_input'][ $taxonomy ][] = $name;
-		    unset($name);
+			unset($name);
 		}
-    }
+	}
 
-    /**
-     * Edit post if the key and created time match
-     */
-    private static function maybe_editing_post( &$post ) {
+	/**
+	 * Edit post if the key and created time match
+	 */
+	private static function maybe_editing_post( &$post ) {
 		$match_by = array(
-		    'post_type'     => $post['post_type'],
-		    'name'          => $post['post_name'],
-		    'post_status'   => $post['post_status'],
-		    'posts_per_page' => 1,
+			'post_type'     => $post['post_type'],
+			'name'          => $post['post_name'],
+			'post_status'   => $post['post_status'],
+			'posts_per_page' => 1,
 		);
 
 		if ( in_array( $post['post_status'], array( 'trash', 'draft' ) ) ) {
-		    $match_by['include'] = $post['post_id'];
-		    unset($match_by['name']);
+			$match_by['include'] = $post['post_id'];
+			unset($match_by['name']);
 		}
 
 		$editing = get_posts($match_by);
 
-        if ( ! empty($editing) && current($editing)->post_date == $post['post_date'] ) {
-            // set the id of the post to edit
-            $post['ID'] = current($editing)->ID;
-        }
-    }
+		if ( ! empty($editing) && current($editing)->post_date == $post['post_date'] ) {
+			// set the id of the post to edit
+			$post['ID'] = current($editing)->ID;
+		}
+	}
 
-    private static function update_postmeta( &$post, $post_id ) {
-        foreach ( $post['postmeta'] as $k => $v ) {
-            if ( '_edit_last' == $k ) {
-                $v = FrmAppHelper::get_user_id_param($v);
-            } else if ( '_thumbnail_id' == $k && FrmAppHelper::pro_is_installed() ) {
-                //change the attachment ID
-                $v = FrmProXMLHelper::get_file_id($v);
-            }
+	private static function update_postmeta( &$post, $post_id ) {
+		foreach ( $post['postmeta'] as $k => $v ) {
+			if ( '_edit_last' == $k ) {
+				$v = FrmAppHelper::get_user_id_param($v);
+			} else if ( '_thumbnail_id' == $k && FrmAppHelper::pro_is_installed() ) {
+				//change the attachment ID
+				$v = FrmProXMLHelper::get_file_id($v);
+			}
 
-            update_post_meta($post_id, $k, $v);
+			update_post_meta($post_id, $k, $v);
 
-            unset($k, $v);
-        }
-    }
+			unset($k, $v);
+		}
+	}
 
 	/**
 	 * If a template includes custom css, let's include it.
@@ -786,72 +786,72 @@ 
 		}
 	}
 
-    /**
-     * @param string $message
-     */
+	/**
+	 * @param string $message
+	 */
 	public static function parse_message( $result, &$message, &$errors ) {
-        if ( is_wp_error($result) ) {
-            $errors[] = $result->get_error_message();
-        } else if ( ! $result ) {
-            return;
-        }
-
-        if ( ! is_array($result) ) {
-            $message = is_string( $result ) ? $result : print_r( $result, 1 );
-            return;
-        }
-
-        $t_strings = array(
-            'imported'  => __( 'Imported', 'formidable' ),
-            'updated'   => __( 'Updated', 'formidable' ),
-        );
-
-        $message = '<ul>';
-        foreach ( $result as $type => $results ) {
+		if ( is_wp_error($result) ) {
+			$errors[] = $result->get_error_message();
+		} else if ( ! $result ) {
+			return;
+		}
+
+		if ( ! is_array($result) ) {
+			$message = is_string( $result ) ? $result : print_r( $result, 1 );
+			return;
+		}
+
+		$t_strings = array(
+			'imported'  => __( 'Imported', 'formidable' ),
+			'updated'   => __( 'Updated', 'formidable' ),
+		);
+
+		$message = '<ul>';
+		foreach ( $result as $type => $results ) {
 			if ( ! isset( $t_strings[ $type ] ) ) {
-                // only print imported and updated
-                continue;
-            }
+				// only print imported and updated
+				continue;
+			}
 
-            $s_message = array();
-            foreach ( $results as $k => $m ) {
-                self::item_count_message($m, $k, $s_message);
-                unset($k, $m);
-            }
+			$s_message = array();
+			foreach ( $results as $k => $m ) {
+				self::item_count_message($m, $k, $s_message);
+				unset($k, $m);
+			}
 
-            if ( ! empty($s_message) ) {
+			if ( ! empty($s_message) ) {
 				$message .= '<li><strong>' . $t_strings[ $type ] . ':</strong> ';
-                $message .= implode(', ', $s_message);
-                $message .= '</li>';
-            }
-        }
-
-        if ( $message == '<ul>' ) {
-            $message = '';
-            $errors[] = __( 'Nothing was imported or updated', 'formidable' );
-        } else {
-            $message .= '</ul>';
-        }
-    }
+				$message .= implode(', ', $s_message);
+				$message .= '</li>';
+			}
+		}
+
+		if ( $message == '<ul>' ) {
+			$message = '';
+			$errors[] = __( 'Nothing was imported or updated', 'formidable' );
+		} else {
+			$message .= '</ul>';
+		}
+	}
 
 	public static function item_count_message( $m, $type, &$s_message ) {
-        if ( ! $m ) {
-            return;
-        }
-
-        $strings = array(
-            'forms'     => sprintf( _n( '%1$s Form', '%1$s Forms', $m, 'formidable' ), $m ),
-            'fields'    => sprintf( _n( '%1$s Field', '%1$s Fields', $m, 'formidable' ), $m ),
-            'items'     => sprintf( _n( '%1$s Entry', '%1$s Entries', $m, 'formidable' ), $m ),
-            'views'     => sprintf( _n( '%1$s View', '%1$s Views', $m, 'formidable' ), $m ),
-            'posts'     => sprintf( _n( '%1$s Post', '%1$s Posts', $m, 'formidable' ), $m ),
-            'styles'     => sprintf( _n( '%1$s Style', '%1$s Styles', $m, 'formidable' ), $m ),
-            'terms'     => sprintf( _n( '%1$s Term', '%1$s Terms', $m, 'formidable' ), $m ),
-            'actions'   => sprintf( _n( '%1$s Form Action', '%1$s Form Actions', $m, 'formidable' ), $m ),
-        );
+		if ( ! $m ) {
+			return;
+		}
+
+		$strings = array(
+			'forms'     => sprintf( _n( '%1$s Form', '%1$s Forms', $m, 'formidable' ), $m ),
+			'fields'    => sprintf( _n( '%1$s Field', '%1$s Fields', $m, 'formidable' ), $m ),
+			'items'     => sprintf( _n( '%1$s Entry', '%1$s Entries', $m, 'formidable' ), $m ),
+			'views'     => sprintf( _n( '%1$s View', '%1$s Views', $m, 'formidable' ), $m ),
+			'posts'     => sprintf( _n( '%1$s Post', '%1$s Posts', $m, 'formidable' ), $m ),
+			'styles'     => sprintf( _n( '%1$s Style', '%1$s Styles', $m, 'formidable' ), $m ),
+			'terms'     => sprintf( _n( '%1$s Term', '%1$s Terms', $m, 'formidable' ), $m ),
+			'actions'   => sprintf( _n( '%1$s Form Action', '%1$s Form Actions', $m, 'formidable' ), $m ),
+		);
 
 		$s_message[] = isset( $strings[ $type ] ) ? $strings[ $type ] : ' ' . $m . ' ' . ucfirst( $type );
-    }
+	}
 
 	/**
 	 * Prepare the form options for export
@@ -882,16 +882,16 @@ 
 	}
 
 	public static function cdata( $str ) {
-	    $str = maybe_unserialize($str);
-	    if ( is_array($str) ) {
-	        $str = json_encode($str);
+		$str = maybe_unserialize($str);
+		if ( is_array($str) ) {
+			$str = json_encode($str);
 		} else if ( seems_utf8( $str ) == false ) {
 			$str = utf8_encode( $str );
 		}
 
-        if ( is_numeric($str) ) {
-            return $str;
-        }
+		if ( is_numeric($str) ) {
+			return $str;
+		}
 
 		self::remove_invalid_characters_from_xml( $str );
 
@@ -912,58 +912,58 @@ 
 		$str = str_replace( '\x1F', '', $str );
 	}
 
-    public static function migrate_form_settings_to_actions( $form_options, $form_id, &$imported = array(), $switch = false ) {
-        // Get post type
-        $post_type = FrmFormActionsController::$action_post_type;
-
-        // Set up imported index, if not set up yet
-        if ( ! isset( $imported['imported']['actions'] ) ) {
-            $imported['imported']['actions'] = 0;
-        }
-
-        // Migrate post settings to action
-        self::migrate_post_settings_to_action( $form_options, $form_id, $post_type, $imported, $switch );
-
-        // Migrate email settings to action
-        self::migrate_email_settings_to_action( $form_options, $form_id, $post_type, $imported, $switch );
-    }
-
-    /**
-    * Migrate post settings to form action
-    *
-    * @param string $post_type
-    */
-    private static function migrate_post_settings_to_action( $form_options, $form_id, $post_type, &$imported, $switch ) {
-        if ( ! isset($form_options['create_post']) || ! $form_options['create_post'] ) {
-            return;
-        }
-
-        $new_action = array(
-            'post_type'     => $post_type,
-            'post_excerpt'  => 'wppost',
+	public static function migrate_form_settings_to_actions( $form_options, $form_id, &$imported = array(), $switch = false ) {
+		// Get post type
+		$post_type = FrmFormActionsController::$action_post_type;
+
+		// Set up imported index, if not set up yet
+		if ( ! isset( $imported['imported']['actions'] ) ) {
+			$imported['imported']['actions'] = 0;
+		}
+
+		// Migrate post settings to action
+		self::migrate_post_settings_to_action( $form_options, $form_id, $post_type, $imported, $switch );
+
+		// Migrate email settings to action
+		self::migrate_email_settings_to_action( $form_options, $form_id, $post_type, $imported, $switch );
+	}
+
+	/**
+	 * Migrate post settings to form action
+	 *
+	 * @param string $post_type
+	 */
+	private static function migrate_post_settings_to_action( $form_options, $form_id, $post_type, &$imported, $switch ) {
+		if ( ! isset($form_options['create_post']) || ! $form_options['create_post'] ) {
+			return;
+		}
+
+		$new_action = array(
+			'post_type'     => $post_type,
+			'post_excerpt'  => 'wppost',
 			'post_title'    => __( 'Create Posts', 'formidable' ),
-            'menu_order'    => $form_id,
-            'post_status'   => 'publish',
-            'post_content'  => array(),
+			'menu_order'    => $form_id,
+			'post_status'   => 'publish',
+			'post_content'  => array(),
 			'post_name'     => $form_id . '_wppost_1',
-        );
+		);
 
-        $post_settings = array(
-            'post_type', 'post_category', 'post_content',
-            'post_excerpt', 'post_title', 'post_name', 'post_date',
+		$post_settings = array(
+			'post_type', 'post_category', 'post_content',
+			'post_excerpt', 'post_title', 'post_name', 'post_date',
 			'post_status', 'post_custom_fields', 'post_password',
-        );
+		);
 
-        foreach ( $post_settings as $post_setting ) {
+		foreach ( $post_settings as $post_setting ) {
 			if ( isset( $form_options[ $post_setting ] ) ) {
 				$new_action['post_content'][ $post_setting ] = $form_options[ $post_setting ];
-            }
-            unset($post_setting);
-        }
+			}
+			unset($post_setting);
+		}
 
 		$new_action['event'] = array( 'create', 'update' );
 
-        if ( $switch ) {
+		if ( $switch ) {
 			// Fields with string or int saved
 			$basic_fields = array( 'post_title', 'post_content', 'post_excerpt', 'post_password', 'post_date', 'post_status' );
 
@@ -971,22 +971,22 @@ 
 			$array_fields = array( 'post_category', 'post_custom_fields' );
 
 			$new_action['post_content'] = self::switch_action_field_ids( $new_action['post_content'], $basic_fields, $array_fields );
-        }
-        $new_action['post_content'] = json_encode($new_action['post_content']);
+		}
+		$new_action['post_content'] = json_encode($new_action['post_content']);
 
-        $exists = get_posts( array(
-            'name'          => $new_action['post_name'],
-            'post_type'     => $new_action['post_type'],
-            'post_status'   => $new_action['post_status'],
-            'numberposts'   => 1,
-        ) );
+		$exists = get_posts( array(
+			'name'          => $new_action['post_name'],
+			'post_type'     => $new_action['post_type'],
+			'post_status'   => $new_action['post_status'],
+			'numberposts'   => 1,
+		) );
 
-        if ( ! $exists ) {
+		if ( ! $exists ) {
 			// this isn't an email, but we need to use a class that will always be included
 			FrmAppHelper::save_json_post( $new_action );
-            $imported['imported']['actions']++;
-        }
-    }
+			$imported['imported']['actions']++;
+		}
+	}
 
 	/**
 	 * Switch old field IDs for new field IDs in emails and post
@@ -999,211 +999,211 @@ 
 	 * @return string $post_content - new field IDs
 	 */
 	private static function switch_action_field_ids( $post_content, $basic_fields, $array_fields = array() ) {
-        global $frm_duplicate_ids;
+		global $frm_duplicate_ids;
 
-        // If there aren't IDs that were switched, end now
-        if ( ! $frm_duplicate_ids ) {
-            return;
-        }
+		// If there aren't IDs that were switched, end now
+		if ( ! $frm_duplicate_ids ) {
+			return;
+		}
 
-        // Get old IDs
-        $old = array_keys( $frm_duplicate_ids );
+		// Get old IDs
+		$old = array_keys( $frm_duplicate_ids );
 
-        // Get new IDs
-        $new = array_values( $frm_duplicate_ids );
+		// Get new IDs
+		$new = array_values( $frm_duplicate_ids );
 
-        // Do a str_replace with each item to set the new IDs
-        foreach ( $post_content as $key => $setting ) {
-            if ( ! is_array( $setting ) && in_array( $key, $basic_fields ) ) {
-                // Replace old IDs with new IDs
+		// Do a str_replace with each item to set the new IDs
+		foreach ( $post_content as $key => $setting ) {
+			if ( ! is_array( $setting ) && in_array( $key, $basic_fields ) ) {
+				// Replace old IDs with new IDs
 				$post_content[ $key ] = str_replace( $old, $new, $setting );
-            } else if ( is_array( $setting ) && in_array( $key, $array_fields ) ) {
-                foreach ( $setting as $k => $val ) {
-                    // Replace old IDs with new IDs
+			} else if ( is_array( $setting ) && in_array( $key, $array_fields ) ) {
+				foreach ( $setting as $k => $val ) {
+					// Replace old IDs with new IDs
 					$post_content[ $key ][ $k ] = str_replace( $old, $new, $val );
-                }
-            }
-            unset( $key, $setting );
-        }
-        return $post_content;
-    }
-
-    private static function migrate_email_settings_to_action( $form_options, $form_id, $post_type, &$imported, $switch ) {
-        // No old notifications or autoresponders to carry over
+				}
+			}
+			unset( $key, $setting );
+		}
+		return $post_content;
+	}
+
+	private static function migrate_email_settings_to_action( $form_options, $form_id, $post_type, &$imported, $switch ) {
+		// No old notifications or autoresponders to carry over
 		if ( ! isset( $form_options['auto_responder'] ) && ! isset( $form_options['notification'] ) && ! isset( $form_options['email_to'] ) ) {
-            return;
-        }
+			return;
+		}
 
-        // Initialize notifications array
-        $notifications = array();
+		// Initialize notifications array
+		$notifications = array();
 
-        // Migrate regular notifications
-        self::migrate_notifications_to_action( $form_options, $form_id, $notifications );
+		// Migrate regular notifications
+		self::migrate_notifications_to_action( $form_options, $form_id, $notifications );
 
-        // Migrate autoresponders
-        self::migrate_autoresponder_to_action( $form_options, $form_id, $notifications );
+		// Migrate autoresponders
+		self::migrate_autoresponder_to_action( $form_options, $form_id, $notifications );
 
-        if ( empty( $notifications ) ) {
-            return;
-        }
+		if ( empty( $notifications ) ) {
+			return;
+		}
 
-        foreach ( $notifications as $new_notification ) {
-            $new_notification['post_type']      = $post_type;
-            $new_notification['post_excerpt']   = 'email';
+		foreach ( $notifications as $new_notification ) {
+			$new_notification['post_type']      = $post_type;
+			$new_notification['post_excerpt']   = 'email';
 			$new_notification['post_title']     = __( 'Email Notification', 'formidable' );
-            $new_notification['menu_order']     = $form_id;
-            $new_notification['post_status']    = 'publish';
+			$new_notification['menu_order']     = $form_id;
+			$new_notification['post_status']    = 'publish';
 
-            // Switch field IDs and keys, if needed
-            if ( $switch ) {
+			// Switch field IDs and keys, if needed
+			if ( $switch ) {
 
 				// Switch field IDs in email conditional logic
 				self::switch_email_contition_field_ids( $new_notification['post_content'] );
 
 				// Switch all other field IDs in email
-                $new_notification['post_content'] = FrmFieldsHelper::switch_field_ids( $new_notification['post_content'] );
-            }
-            $new_notification['post_content']   = FrmAppHelper::prepare_and_encode( $new_notification['post_content'] );
-
-            $exists = get_posts( array(
-                'name'          => $new_notification['post_name'],
-                'post_type'     => $new_notification['post_type'],
-                'post_status'   => $new_notification['post_status'],
-                'numberposts'   => 1,
-            ) );
-
-            if ( empty($exists) ) {
+				$new_notification['post_content'] = FrmFieldsHelper::switch_field_ids( $new_notification['post_content'] );
+			}
+			$new_notification['post_content']   = FrmAppHelper::prepare_and_encode( $new_notification['post_content'] );
+
+			$exists = get_posts( array(
+				'name'          => $new_notification['post_name'],
+				'post_type'     => $new_notification['post_type'],
+				'post_status'   => $new_notification['post_status'],
+				'numberposts'   => 1,
+			) );
+
+			if ( empty($exists) ) {
 				FrmAppHelper::save_json_post( $new_notification );
-                $imported['imported']['actions']++;
-            }
-            unset($new_notification);
-        }
-    }
-
-    private static function migrate_notifications_to_action( $form_options, $form_id, &$notifications ) {
-        if ( ! isset( $form_options['notification'] ) && isset( $form_options['email_to'] ) && ! empty( $form_options['email_to'] ) ) {
-            // add old settings into notification array
+				$imported['imported']['actions']++;
+			}
+			unset($new_notification);
+		}
+	}
+
+	private static function migrate_notifications_to_action( $form_options, $form_id, &$notifications ) {
+		if ( ! isset( $form_options['notification'] ) && isset( $form_options['email_to'] ) && ! empty( $form_options['email_to'] ) ) {
+			// add old settings into notification array
 			$form_options['notification'] = array( 0 => $form_options );
-        } else if ( isset( $form_options['notification']['email_to'] ) ) {
-            // make sure it's in the correct format
+		} else if ( isset( $form_options['notification']['email_to'] ) ) {
+			// make sure it's in the correct format
 			$form_options['notification'] = array( 0 => $form_options['notification'] );
-        }
+		}
 
-        if ( isset( $form_options['notification'] ) && is_array($form_options['notification']) ) {
-            foreach ( $form_options['notification'] as $email_key => $notification ) {
+		if ( isset( $form_options['notification'] ) && is_array($form_options['notification']) ) {
+			foreach ( $form_options['notification'] as $email_key => $notification ) {
 
-                $atts = array( 'email_to' => '', 'reply_to' => '', 'reply_to_name' => '', 'event' => '', 'form_id' => $form_id, 'email_key' => $email_key );
+				$atts = array( 'email_to' => '', 'reply_to' => '', 'reply_to_name' => '', 'event' => '', 'form_id' => $form_id, 'email_key' => $email_key );
 
-                // Format the email data
-                self::format_email_data( $atts, $notification );
+				// Format the email data
+				self::format_email_data( $atts, $notification );
 
 				if ( isset( $notification['twilio'] ) && $notification['twilio'] ) {
 					do_action( 'frm_create_twilio_action', $atts, $notification );
 				}
 
-                // Setup the new notification
-                $new_notification = array();
-                self::setup_new_notification( $new_notification, $notification, $atts );
+				// Setup the new notification
+				$new_notification = array();
+				self::setup_new_notification( $new_notification, $notification, $atts );
 
-                $notifications[] = $new_notification;
-            }
-        }
-    }
+				$notifications[] = $new_notification;
+			}
+		}
+	}
 
-    private static function format_email_data( &$atts, $notification ) {
-        // Format email_to
-        self::format_email_to_data( $atts, $notification );
+	private static function format_email_data( &$atts, $notification ) {
+		// Format email_to
+		self::format_email_to_data( $atts, $notification );
 
-        // Format the reply to email and name
-        $reply_fields = array( 'reply_to' => '', 'reply_to_name' => '' );
-        foreach ( $reply_fields as $f => $val ) {
+		// Format the reply to email and name
+		$reply_fields = array( 'reply_to' => '', 'reply_to_name' => '' );
+		foreach ( $reply_fields as $f => $val ) {
 			if ( isset( $notification[ $f ] ) ) {
 				$atts[ $f ] = $notification[ $f ];
 				if ( 'custom' == $notification[ $f ] ) {
 					$atts[ $f ] = $notification[ 'cust_' . $f ];
 				} else if ( is_numeric( $atts[ $f ] ) && ! empty( $atts[ $f ] ) ) {
 					$atts[ $f ] = '[' . $atts[ $f ] . ']';
-                }
-            }
-            unset( $f, $val );
-        }
+				}
+			}
+			unset( $f, $val );
+		}
 
-        // Format event
+		// Format event
 		$atts['event'] = array( 'create' );
-        if ( isset( $notification['update_email'] ) && 1 == $notification['update_email'] ) {
-            $atts['event'][] = 'update';
-        } else if ( isset($notification['update_email']) && 2 == $notification['update_email'] ) {
+		if ( isset( $notification['update_email'] ) && 1 == $notification['update_email'] ) {
+			$atts['event'][] = 'update';
+		} else if ( isset($notification['update_email']) && 2 == $notification['update_email'] ) {
 			$atts['event'] = array( 'update' );
-        }
-    }
+		}
+	}
 
-    private static function format_email_to_data( &$atts, $notification ) {
-        if ( isset( $notification['email_to'] ) ) {
+	private static function format_email_to_data( &$atts, $notification ) {
+		if ( isset( $notification['email_to'] ) ) {
 			$atts['email_to'] = preg_split( '/ (,|;) /', $notification['email_to'] );
-        } else {
-            $atts['email_to'] = array();
-        }
+		} else {
+			$atts['email_to'] = array();
+		}
 
-        if ( isset( $notification['also_email_to'] ) ) {
-            $email_fields = (array) $notification['also_email_to'];
-            $atts['email_to'] = array_merge( $email_fields, $atts['email_to'] );
-            unset( $email_fields );
-        }
+		if ( isset( $notification['also_email_to'] ) ) {
+			$email_fields = (array) $notification['also_email_to'];
+			$atts['email_to'] = array_merge( $email_fields, $atts['email_to'] );
+			unset( $email_fields );
+		}
 
-        foreach ( $atts['email_to'] as $key => $email_field ) {
+		foreach ( $atts['email_to'] as $key => $email_field ) {
 
-            if ( is_numeric( $email_field ) ) {
+			if ( is_numeric( $email_field ) ) {
 				$atts['email_to'][ $key ] = '[' . $email_field . ']';
-            }
+			}
 
-            if ( strpos( $email_field, '|') ) {
-                $email_opt = explode( '|', $email_field );
-                if ( isset( $email_opt[0] ) ) {
+			if ( strpos( $email_field, '|') ) {
+				$email_opt = explode( '|', $email_field );
+				if ( isset( $email_opt[0] ) ) {
 					$atts['email_to'][ $key ] = '[' . $email_opt[0] . ' show=' . $email_opt[1] . ']';
-                }
-                unset( $email_opt );
-            }
-        }
-        $atts['email_to'] = implode(', ', $atts['email_to']);
-    }
-
-    private static function setup_new_notification( &$new_notification, $notification, $atts ) {
-        // Set up new notification
-        $new_notification = array(
-            'post_content'  => array(
-                'email_to'      => $atts['email_to'],
-                'event'         => $atts['event'],
-            ),
+				}
+				unset( $email_opt );
+			}
+		}
+		$atts['email_to'] = implode(', ', $atts['email_to']);
+	}
+
+	private static function setup_new_notification( &$new_notification, $notification, $atts ) {
+		// Set up new notification
+		$new_notification = array(
+			'post_content'  => array(
+				'email_to'      => $atts['email_to'],
+				'event'         => $atts['event'],
+			),
 			'post_name'         => $atts['form_id'] . '_email_' . $atts['email_key'],
-        );
+		);
 
-        // Add more fields to the new notification
-        $add_fields = array( 'email_message', 'email_subject', 'plain_text', 'inc_user_info', 'conditions' );
-        foreach ( $add_fields as $add_field ) {
+		// Add more fields to the new notification
+		$add_fields = array( 'email_message', 'email_subject', 'plain_text', 'inc_user_info', 'conditions' );
+		foreach ( $add_fields as $add_field ) {
 			if ( isset( $notification[ $add_field ] ) ) {
 				$new_notification['post_content'][ $add_field ] = $notification[ $add_field ];
-            } else if ( in_array( $add_field, array( 'plain_text', 'inc_user_info' ) ) ) {
+			} else if ( in_array( $add_field, array( 'plain_text', 'inc_user_info' ) ) ) {
 				$new_notification['post_content'][ $add_field ] = 0;
-            } else {
+			} else {
 				$new_notification['post_content'][ $add_field ] = '';
-            }
-            unset( $add_field );
-        }
+			}
+			unset( $add_field );
+		}
 
 		// Set reply to
 		$new_notification['post_content']['reply_to'] = $atts['reply_to'];
 
-        // Set from
+		// Set from
 		if ( ! empty( $atts['reply_to'] ) || ! empty( $atts['reply_to_name'] ) ) {
 			$new_notification['post_content']['from'] = ( empty( $atts['reply_to_name'] ) ? '[sitename]' : $atts['reply_to_name'] ) . ' <' . ( empty( $atts['reply_to'] ) ? '[admin_email]' : $atts['reply_to'] ) . '>';
-        }
-    }
+		}
+	}
 
 	/**
-	* Switch field IDs in pre-2.0 email conditional logic
-	*
-	* @param $post_content array, pass by reference
-	*/
+	 * Switch field IDs in pre-2.0 email conditional logic
+	 *
+	 * @param $post_content array, pass by reference
+	 */
 	private static function switch_email_contition_field_ids( &$post_content ) {
 		// Switch field IDs in conditional logic
 		if ( isset( $post_content['conditions'] ) && is_array( $post_content['conditions'] ) ) {
@@ -1216,36 +1216,36 @@ 
 		}
 	}
 
-    private static function migrate_autoresponder_to_action( $form_options, $form_id, &$notifications ) {
-        if ( isset($form_options['auto_responder']) && $form_options['auto_responder'] && isset($form_options['ar_email_message']) && $form_options['ar_email_message'] ) {
-            // migrate autoresponder
-
-            $email_field = isset($form_options['ar_email_to']) ? $form_options['ar_email_to'] : 0;
-            if ( strpos($email_field, '|') ) {
-                // data from entries field
-                $email_field = explode('|', $email_field);
-                if ( isset($email_field[1]) ) {
-                    $email_field = $email_field[1];
-                }
-            }
-            if ( is_numeric($email_field) && ! empty($email_field) ) {
+	private static function migrate_autoresponder_to_action( $form_options, $form_id, &$notifications ) {
+		if ( isset($form_options['auto_responder']) && $form_options['auto_responder'] && isset($form_options['ar_email_message']) && $form_options['ar_email_message'] ) {
+			// migrate autoresponder
+
+			$email_field = isset($form_options['ar_email_to']) ? $form_options['ar_email_to'] : 0;
+			if ( strpos($email_field, '|') ) {
+				// data from entries field
+				$email_field = explode('|', $email_field);
+				if ( isset($email_field[1]) ) {
+					$email_field = $email_field[1];
+				}
+			}
+			if ( is_numeric($email_field) && ! empty($email_field) ) {
 				$email_field = '[' . $email_field . ']';
-            }
-
-            $notification = $form_options;
-            $new_notification2 = array(
-                'post_content'  => array(
-                    'email_message' => $notification['ar_email_message'],
-                    'email_subject' => isset($notification['ar_email_subject']) ? $notification['ar_email_subject'] : '',
-                    'email_to'      => $email_field,
-                    'plain_text'    => isset($notification['ar_plain_text']) ? $notification['ar_plain_text'] : 0,
-                    'inc_user_info' => 0,
-                ),
+			}
+
+			$notification = $form_options;
+			$new_notification2 = array(
+				'post_content'  => array(
+					'email_message' => $notification['ar_email_message'],
+					'email_subject' => isset($notification['ar_email_subject']) ? $notification['ar_email_subject'] : '',
+					'email_to'      => $email_field,
+					'plain_text'    => isset($notification['ar_plain_text']) ? $notification['ar_plain_text'] : 0,
+					'inc_user_info' => 0,
+				),
 				'post_name'     => $form_id . '_email_' . count( $notifications ),
-            );
+			);
 
-            $reply_to = isset($notification['ar_reply_to']) ? $notification['ar_reply_to'] : '';
-            $reply_to_name = isset($notification['ar_reply_to_name']) ? $notification['ar_reply_to_name'] : '';
+			$reply_to = isset($notification['ar_reply_to']) ? $notification['ar_reply_to'] : '';
+			$reply_to_name = isset($notification['ar_reply_to_name']) ? $notification['ar_reply_to_name'] : '';
 
 			if ( ! empty( $reply_to ) ) {
 				$new_notification2['post_content']['reply_to'] = $reply_to;
@@ -1255,9 +1255,9 @@ 
 				$new_notification2['post_content']['from'] = ( empty( $reply_to_name ) ? '[sitename]' : $reply_to_name ) . ' <' . ( empty( $reply_to ) ? '[admin_email]' : $reply_to ) . '>';
 			}
 
-            $notifications[] = $new_notification2;
-            unset( $new_notification2 );
-        }
-    }
+			$notifications[] = $new_notification2;
+			unset( $new_notification2 );
+		}
+	}
 }
 

Spacing +149 added lines, -149 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -36,10 +36,10 @@ 
 			'terms'    => array(),
         );
 
-        unset($defaults);
+        unset( $defaults );
 
 		if ( ! defined( 'WP_IMPORTING' ) ) {
-            define('WP_IMPORTING', true);
+            define( 'WP_IMPORTING', true );
         }
 
 		if ( ! class_exists( 'DOMDocument' ) ) {
@@ -52,7 +52,7 @@ 
 			return new WP_Error( 'SimpleXML_parse_error', __( 'There was an error when reading this XML file', 'formidable' ), libxml_get_errors() );
 		}
 
-		if ( ! function_exists('simplexml_import_dom') ) {
+		if ( ! function_exists( 'simplexml_import_dom' ) ) {
 			return new WP_Error( 'SimpleXML_parse_error', __( 'Your server is missing the simplexml_import_dom function', 'formidable' ), libxml_get_errors() );
 		}
 
@@ -67,14 +67,14 @@ 
         // add terms, forms (form and field ids), posts (post ids), and entries to db, in that order
 		foreach ( array( 'term', 'form', 'view' ) as $item_type ) {
             // grab cats, tags, and terms, or forms or posts
-            if ( isset($xml->{$item_type} ) ) {
+            if ( isset( $xml->{$item_type} ) ) {
 				$function_name = 'import_xml_' . $item_type . 's';
 				$imported = self::$function_name( $xml->{$item_type}, $imported );
 				unset( $function_name, $xml->{$item_type} );
             }
         }
 
-	    $return = apply_filters('frm_importing_xml', $imported, $xml );
+	    $return = apply_filters( 'frm_importing_xml', $imported, $xml );
 
 	    return $return;
     }
@@ -91,11 +91,11 @@ 
                 'slug'          => (string) $t->term_slug,
                 'description'   => (string) $t->term_description,
 				'parent'        => empty( $parent ) ? 0 : $parent,
-            ));
+            ) );
 
 			if ( $term && is_array( $term ) ) {
-                $imported['imported']['terms']++;
-				$imported['terms'][ (int) $t->term_id ] = $term['term_id'];
+                $imported['imported']['terms'] ++;
+				$imported['terms'][(int) $t->term_id] = $term['term_id'];
             }
 
 			unset( $term, $t );
@@ -144,9 +144,9 @@ 
 			} else {
 				$form_id = FrmForm::create( $form );
 		        if ( $form_id ) {
-		            $imported['imported']['forms']++;
+		            $imported['imported']['forms'] ++;
 		            // Keep track of whether this specific form was updated or not
-					$imported['form_status'][ $form_id ] = 'imported';
+					$imported['form_status'][$form_id] = 'imported';
 					self::track_imported_child_forms( (int) $form_id, $form['parent_form_id'], $child_forms );
 		        }
 			}
@@ -158,14 +158,14 @@ 
 		    // Update field ids/keys to new ones
 			do_action( 'frm_after_duplicate_form', $form_id, $form, array( 'old_id' => $old_id ) );
 
-			$imported['forms'][ (int) $item->id ] = $form_id;
+			$imported['forms'][(int) $item->id] = $form_id;
 
             // Send pre 2.0 form options through function that creates actions
             self::migrate_form_settings_to_actions( $form['options'], $form_id, $imported, true );
 
 			do_action( 'frm_after_import_form', $form_id, $form );
 
-		    unset($form, $item);
+		    unset( $form, $item );
 		}
 
 		self::maybe_update_child_form_parent_id( $imported['forms'], $child_forms );
@@ -207,18 +207,18 @@ 
 	private static function update_form( $this_form, $form, &$imported ) {
 		$form_id = $this_form->id;
 		FrmForm::update( $form_id, $form );
-		$imported['updated']['forms']++;
+		$imported['updated']['forms'] ++;
 		// Keep track of whether this specific form was updated or not
-		$imported['form_status'][ $form_id ] = 'updated';
+		$imported['form_status'][$form_id] = 'updated';
 	}
 
 	private static function get_form_fields( $form_id ) {
 		$form_fields = FrmField::get_all_for_form( $form_id, '', 'exclude', 'exclude' );
 		$old_fields = array();
 		foreach ( $form_fields as $f ) {
-			$old_fields[ $f->id ] = $f;
-			$old_fields[ $f->field_key ] = $f->id;
-			unset($f);
+			$old_fields[$f->id] = $f;
+			$old_fields[$f->field_key] = $f->id;
+			unset( $f );
 		}
 		$form_fields = $old_fields;
 		return $form_fields;
@@ -249,7 +249,7 @@ 
 		$regular_forms = array();
 
 		foreach ( $forms as $form ) {
-			$parent_form_id = isset( $form->parent_form_id) ? (int) $form->parent_form_id : 0;
+			$parent_form_id = isset( $form->parent_form_id ) ? (int) $form->parent_form_id : 0;
 
 			if ( $parent_form_id ) {
 				$child_forms[] = $form;
@@ -271,7 +271,7 @@ 
 	*/
 	private static function track_imported_child_forms( $form_id, $parent_form_id, &$child_forms ) {
 		if ( $parent_form_id ) {
-			$child_forms[ $form_id ] = $parent_form_id;
+			$child_forms[$form_id] = $parent_form_id;
 		}
 	}
 
@@ -286,9 +286,9 @@ 
 	private static function maybe_update_child_form_parent_id( $imported_forms, $child_forms ) {
 		foreach ( $child_forms as $child_form_id => $old_parent_form_id ) {
 
-			if ( isset( $imported_forms[ $old_parent_form_id ] ) && $imported_forms[ $old_parent_form_id ] != $old_parent_form_id ) {
+			if ( isset( $imported_forms[$old_parent_form_id] ) && $imported_forms[$old_parent_form_id] != $old_parent_form_id ) {
 				// Update all children with this old parent_form_id
-				$new_parent_form_id = (int) $imported_forms[ $old_parent_form_id ];
+				$new_parent_form_id = (int) $imported_forms[$old_parent_form_id];
 
 				FrmForm::update( $child_form_id, array( 'parent_form_id' => $new_parent_form_id ) );
 			}
@@ -307,15 +307,15 @@ 
 		foreach ( $xml_fields as $field ) {
 			$f = self::fill_field( $field, $form_id );
 
-		    if ( is_array($f['default_value']) && in_array($f['type'], array(
+		    if ( is_array( $f['default_value'] ) && in_array( $f['type'], array(
 		        'text', 'email', 'url', 'textarea',
-		        'number','phone', 'date',
+		        'number', 'phone', 'date',
 		        'hidden', 'password', 'tag', 'image',
-		    )) ) {
-		        if ( count($f['default_value']) === 1 ) {
+		    ) ) ) {
+		        if ( count( $f['default_value'] ) === 1 ) {
 					$f['default_value'] = '[' . reset( $f['default_value'] ) . ']';
 		        } else {
-		            $f['default_value'] = reset($f['default_value']);
+		            $f['default_value'] = reset( $f['default_value'] );
 		        }
 		    }
 
@@ -323,27 +323,27 @@ 
 			self::maybe_update_form_select( $f, $imported );
 			self::maybe_update_get_values_form_setting( $imported, $f );
 
-			if ( ! empty($this_form) ) {
+			if ( ! empty( $this_form ) ) {
 				// check for field to edit by field id
-				if ( isset( $form_fields[ $f['id'] ] ) ) {
+				if ( isset( $form_fields[$f['id']] ) ) {
 					FrmField::update( $f['id'], $f );
-					$imported['updated']['fields']++;
+					$imported['updated']['fields'] ++;
 
-					unset( $form_fields[ $f['id'] ] );
+					unset( $form_fields[$f['id']] );
 
 					//unset old field key
-					if ( isset( $form_fields[ $f['field_key'] ] ) ) {
-						unset( $form_fields[ $f['field_key'] ] );
+					if ( isset( $form_fields[$f['field_key']] ) ) {
+						unset( $form_fields[$f['field_key']] );
 					}
-				} else if ( isset( $form_fields[ $f['field_key'] ] ) ) {
+				} else if ( isset( $form_fields[$f['field_key']] ) ) {
 					// check for field to edit by field key
-					unset($f['id']);
+					unset( $f['id'] );
 
-					FrmField::update( $form_fields[ $f['field_key'] ], $f );
-					$imported['updated']['fields']++;
+					FrmField::update( $form_fields[$f['field_key']], $f );
+					$imported['updated']['fields'] ++;
 
-					unset( $form_fields[ $form_fields[ $f['field_key'] ] ] ); //unset old field id
-					unset( $form_fields[ $f['field_key'] ] ); //unset old field key
+					unset( $form_fields[$form_fields[$f['field_key']]] ); //unset old field id
+					unset( $form_fields[$f['field_key']] ); //unset old field key
 				} else {
 					// if no matching field id or key in this form, create the field
 					self::create_imported_field( $f, $imported );
@@ -362,11 +362,11 @@ 
 			'name'          => (string) $field->name,
 			'description'   => (string) $field->description,
 			'type'          => (string) $field->type,
-			'default_value' => FrmAppHelper::maybe_json_decode( (string) $field->default_value),
+			'default_value' => FrmAppHelper::maybe_json_decode( (string) $field->default_value ),
 			'field_order'   => (int) $field->field_order,
 			'form_id'       => (int) $form_id,
 			'required'      => (int) $field->required,
-			'options'       => FrmAppHelper::maybe_json_decode( (string) $field->options),
+			'options'       => FrmAppHelper::maybe_json_decode( (string) $field->options ),
 			'field_options' => FrmAppHelper::maybe_json_decode( (string) $field->field_options ),
 		);
 	}
@@ -410,8 +410,8 @@ 
 		if ( $f['type'] == 'form' || ( $f['type'] == 'divider' && FrmField::is_option_true( $f['field_options'], 'repeat' ) ) ) {
 			if ( FrmField::is_option_true( $f['field_options'], 'form_select' ) ) {
 				$form_select = $f['field_options']['form_select'];
-				if ( isset( $imported['forms'][ $form_select ] ) ) {
-					$f['field_options']['form_select'] = $imported['forms'][ $form_select ];
+				if ( isset( $imported['forms'][$form_select] ) ) {
+					$f['field_options']['form_select'] = $imported['forms'][$form_select];
 				}
 			}
 		}
@@ -431,8 +431,8 @@ 
 
 		if ( FrmField::is_option_true_in_array( $f['field_options'], 'get_values_form' ) ) {
 			$old_form = $f['field_options']['get_values_form'];
-			if ( isset( $imported['forms'][ $old_form ] ) ) {
-				$f['field_options']['get_values_form'] = $imported['forms'][ $old_form ];
+			if ( isset( $imported['forms'][$old_form] ) ) {
+				$f['field_options']['get_values_form'] = $imported['forms'][$old_form];
 			}
 		}
 	}
@@ -447,7 +447,7 @@ 
 	private static function create_imported_field( $f, &$imported ) {
 		$new_id = FrmField::create( $f );
 		if ( $new_id != false ) {
-			$imported['imported']['fields']++;
+			$imported['imported']['fields'] ++;
 			do_action( 'frm_after_field_is_imported', $f, $new_id );
 		}
 	}
@@ -546,9 +546,9 @@ 
 			);
 
             $old_id = $post['post_id'];
-            self::populate_post($post, $item, $imported);
+            self::populate_post( $post, $item, $imported );
 
-			unset($item);
+			unset( $item );
 
 			$post_id = false;
             if ( $post['post_type'] == $form_action_type ) {
@@ -556,7 +556,7 @@ 
 				if ( $action_control && is_object( $action_control ) ) {
 					$post_id = $action_control->maybe_create_action( $post, $imported['form_status'] );
 				}
-                unset($action_control);
+                unset( $action_control );
             } else if ( $post['post_type'] == 'frm_styles' ) {
                 // Properly encode post content before inserting the post
                 $post['post_content'] = FrmAppHelper::maybe_json_decode( $post['post_content'] );
@@ -571,24 +571,24 @@ 
                 $post_id = wp_insert_post( $post );
             }
 
-            if ( ! is_numeric($post_id) ) {
+            if ( ! is_numeric( $post_id ) ) {
                 continue;
             }
 
-            self::update_postmeta($post, $post_id);
+            self::update_postmeta( $post, $post_id );
 
             $this_type = 'posts';
-			if ( isset( $post_types[ $post['post_type'] ] ) ) {
-				$this_type = $post_types[ $post['post_type'] ];
+			if ( isset( $post_types[$post['post_type']] ) ) {
+				$this_type = $post_types[$post['post_type']];
             }
 
-            if ( isset($post['ID']) && $post_id == $post['ID'] ) {
-                $imported['updated'][ $this_type ]++;
+            if ( isset( $post['ID'] ) && $post_id == $post['ID'] ) {
+                $imported['updated'][$this_type] ++;
             } else {
-                $imported['imported'][ $this_type ]++;
+                $imported['imported'][$this_type] ++;
             }
 
-			$imported['posts'][ (int) $old_id ] = $post_id;
+			$imported['posts'][(int) $old_id] = $post_id;
 
 			do_action( 'frm_after_import_view', $post_id, $post );
 
@@ -601,13 +601,13 @@ 
     }
 
     private static function populate_post( &$post, $item, $imported ) {
-		if ( isset($item->attachment_url) ) {
+		if ( isset( $item->attachment_url ) ) {
 			$post['attachment_url'] = (string) $item->attachment_url;
 		}
 
-		if ( $post['post_type'] == FrmFormActionsController::$action_post_type && isset( $imported['forms'][ (int) $post['menu_order'] ] ) ) {
+		if ( $post['post_type'] == FrmFormActionsController::$action_post_type && isset( $imported['forms'][(int) $post['menu_order']] ) ) {
 		    // update to new form id
-		    $post['menu_order'] = $imported['forms'][ (int) $post['menu_order'] ];
+		    $post['menu_order'] = $imported['forms'][(int) $post['menu_order']];
 		}
 
 		// Don't allow default styles to take over a site's default style
@@ -616,13 +616,13 @@ 
 		}
 
 		foreach ( $item->postmeta as $meta ) {
-		    self::populate_postmeta($post, $meta, $imported);
-			unset($meta);
+		    self::populate_postmeta( $post, $meta, $imported );
+			unset( $meta );
 		}
 
-        self::populate_taxonomies($post, $item);
+        self::populate_taxonomies( $post, $item );
 
-        self::maybe_editing_post($post);
+        self::maybe_editing_post( $post );
     }
 
     private static function populate_postmeta( &$post, $meta, $imported ) {
@@ -634,27 +634,27 @@ 
 		);
 
 		//switch old form and field ids to new ones
-		if ( $m['key'] == 'frm_form_id' && isset($imported['forms'][ (int) $m['value'] ]) ) {
-		    $m['value'] = $imported['forms'][ (int) $m['value'] ];
+		if ( $m['key'] == 'frm_form_id' && isset( $imported['forms'][(int) $m['value']] ) ) {
+		    $m['value'] = $imported['forms'][(int) $m['value']];
 		} else {
-		    $m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
+		    $m['value'] = FrmAppHelper::maybe_json_decode( $m['value'] );
 
-		    if ( ! empty($frm_duplicate_ids) ) {
+		    if ( ! empty( $frm_duplicate_ids ) ) {
 
 		        if ( $m['key'] == 'frm_dyncontent' ) {
-		            $m['value'] = FrmFieldsHelper::switch_field_ids($m['value']);
+		            $m['value'] = FrmFieldsHelper::switch_field_ids( $m['value'] );
     		    } else if ( $m['key'] == 'frm_options' ) {
 
 					foreach ( array( 'date_field_id', 'edate_field_id' ) as $setting_name ) {
-						if ( isset( $m['value'][ $setting_name ] ) && is_numeric( $m['value'][ $setting_name ] ) && isset( $frm_duplicate_ids[ $m['value'][ $setting_name ] ] ) ) {
-							$m['value'][ $setting_name ] = $frm_duplicate_ids[ $m['value'][ $setting_name ] ];
+						if ( isset( $m['value'][$setting_name] ) && is_numeric( $m['value'][$setting_name] ) && isset( $frm_duplicate_ids[$m['value'][$setting_name]] ) ) {
+							$m['value'][$setting_name] = $frm_duplicate_ids[$m['value'][$setting_name]];
     		            }
     		        }
 
                     $check_dup_array = array();
     		        if ( isset( $m['value']['order_by'] ) && ! empty( $m['value']['order_by'] ) ) {
-    		            if ( is_numeric( $m['value']['order_by'] ) && isset( $frm_duplicate_ids[ $m['value']['order_by'] ] ) ) {
-    		                $m['value']['order_by'] = $frm_duplicate_ids[ $m['value']['order_by'] ];
+    		            if ( is_numeric( $m['value']['order_by'] ) && isset( $frm_duplicate_ids[$m['value']['order_by']] ) ) {
+    		                $m['value']['order_by'] = $frm_duplicate_ids[$m['value']['order_by']];
     		            } else if ( is_array( $m['value']['order_by'] ) ) {
                             $check_dup_array[] = 'order_by';
     		            }
@@ -665,22 +665,22 @@ 
     		        }
 
                     foreach ( $check_dup_array as $check_k ) {
-						foreach ( (array) $m['value'][ $check_k ] as $mk => $mv ) {
-							if ( isset( $frm_duplicate_ids[ $mv ] ) ) {
-								$m['value'][ $check_k ][ $mk ] = $frm_duplicate_ids[ $mv ];
+						foreach ( (array) $m['value'][$check_k] as $mk => $mv ) {
+							if ( isset( $frm_duplicate_ids[$mv] ) ) {
+								$m['value'][$check_k][$mk] = $frm_duplicate_ids[$mv];
 		                    }
-		                    unset($mk, $mv);
+		                    unset( $mk, $mv );
 		                }
                     }
     		    }
 		    }
 		}
 
-		if ( ! is_array($m['value']) ) {
-		    $m['value'] = FrmAppHelper::maybe_json_decode($m['value']);
+		if ( ! is_array( $m['value'] ) ) {
+		    $m['value'] = FrmAppHelper::maybe_json_decode( $m['value'] );
 		}
 
-		$post['postmeta'][ (string) $meta->meta_key ] = $m['value'];
+		$post['postmeta'][(string) $meta->meta_key] = $m['value'];
     }
 
     /**
@@ -696,23 +696,23 @@ 
             }
 
 		    $taxonomy = (string) $att['domain'];
-		    if ( is_taxonomy_hierarchical($taxonomy) ) {
+		    if ( is_taxonomy_hierarchical( $taxonomy ) ) {
 		        $name = (string) $att['nicename'];
-		        $h_term = get_term_by('slug', $name, $taxonomy);
+		        $h_term = get_term_by( 'slug', $name, $taxonomy );
 		        if ( $h_term ) {
 		            $name = $h_term->term_id;
 		        }
-		        unset($h_term);
+		        unset( $h_term );
 		    } else {
 		        $name = (string) $c;
 		    }
 
-			if ( ! isset( $post['tax_input'][ $taxonomy ] ) ) {
-				$post['tax_input'][ $taxonomy ] = array();
+			if ( ! isset( $post['tax_input'][$taxonomy] ) ) {
+				$post['tax_input'][$taxonomy] = array();
 			}
 
-			$post['tax_input'][ $taxonomy ][] = $name;
-		    unset($name);
+			$post['tax_input'][$taxonomy][] = $name;
+		    unset( $name );
 		}
     }
 
@@ -729,29 +729,29 @@ 
 
 		if ( in_array( $post['post_status'], array( 'trash', 'draft' ) ) ) {
 		    $match_by['include'] = $post['post_id'];
-		    unset($match_by['name']);
+		    unset( $match_by['name'] );
 		}
 
-		$editing = get_posts($match_by);
+		$editing = get_posts( $match_by );
 
-        if ( ! empty($editing) && current($editing)->post_date == $post['post_date'] ) {
+        if ( ! empty( $editing ) && current( $editing )->post_date == $post['post_date'] ) {
             // set the id of the post to edit
-            $post['ID'] = current($editing)->ID;
+            $post['ID'] = current( $editing )->ID;
         }
     }
 
     private static function update_postmeta( &$post, $post_id ) {
         foreach ( $post['postmeta'] as $k => $v ) {
             if ( '_edit_last' == $k ) {
-                $v = FrmAppHelper::get_user_id_param($v);
+                $v = FrmAppHelper::get_user_id_param( $v );
             } else if ( '_thumbnail_id' == $k && FrmAppHelper::pro_is_installed() ) {
                 //change the attachment ID
-                $v = FrmProXMLHelper::get_file_id($v);
+                $v = FrmProXMLHelper::get_file_id( $v );
             }
 
-            update_post_meta($post_id, $k, $v);
+            update_post_meta( $post_id, $k, $v );
 
-            unset($k, $v);
+            unset( $k, $v );
         }
     }
 
@@ -790,13 +790,13 @@ 
      * @param string $message
      */
 	public static function parse_message( $result, &$message, &$errors ) {
-        if ( is_wp_error($result) ) {
+        if ( is_wp_error( $result ) ) {
             $errors[] = $result->get_error_message();
         } else if ( ! $result ) {
             return;
         }
 
-        if ( ! is_array($result) ) {
+        if ( ! is_array( $result ) ) {
             $message = is_string( $result ) ? $result : print_r( $result, 1 );
             return;
         }
@@ -808,20 +808,20 @@ 
 
         $message = '<ul>';
         foreach ( $result as $type => $results ) {
-			if ( ! isset( $t_strings[ $type ] ) ) {
+			if ( ! isset( $t_strings[$type] ) ) {
                 // only print imported and updated
                 continue;
             }
 
             $s_message = array();
             foreach ( $results as $k => $m ) {
-                self::item_count_message($m, $k, $s_message);
-                unset($k, $m);
+                self::item_count_message( $m, $k, $s_message );
+                unset( $k, $m );
             }
 
-            if ( ! empty($s_message) ) {
-				$message .= '<li><strong>' . $t_strings[ $type ] . ':</strong> ';
-                $message .= implode(', ', $s_message);
+            if ( ! empty( $s_message ) ) {
+				$message .= '<li><strong>' . $t_strings[$type] . ':</strong> ';
+                $message .= implode( ', ', $s_message );
                 $message .= '</li>';
             }
         }
@@ -850,7 +850,7 @@ 
             'actions'   => sprintf( _n( '%1$s Form Action', '%1$s Form Actions', $m, 'formidable' ), $m ),
         );
 
-		$s_message[] = isset( $strings[ $type ] ) ? $strings[ $type ] : ' ' . $m . ' ' . ucfirst( $type );
+		$s_message[] = isset( $strings[$type] ) ? $strings[$type] : ' ' . $m . ' ' . ucfirst( $type );
     }
 
 	/**
@@ -882,14 +882,14 @@ 
 	}
 
 	public static function cdata( $str ) {
-	    $str = maybe_unserialize($str);
-	    if ( is_array($str) ) {
-	        $str = json_encode($str);
+	    $str = maybe_unserialize( $str );
+	    if ( is_array( $str ) ) {
+	        $str = json_encode( $str );
 		} else if ( seems_utf8( $str ) == false ) {
 			$str = utf8_encode( $str );
 		}
 
-        if ( is_numeric($str) ) {
+        if ( is_numeric( $str ) ) {
             return $str;
         }
 
@@ -934,7 +934,7 @@ 
     * @param string $post_type
     */
     private static function migrate_post_settings_to_action( $form_options, $form_id, $post_type, &$imported, $switch ) {
-        if ( ! isset($form_options['create_post']) || ! $form_options['create_post'] ) {
+        if ( ! isset( $form_options['create_post'] ) || ! $form_options['create_post'] ) {
             return;
         }
 
@@ -955,10 +955,10 @@ 
         );
 
         foreach ( $post_settings as $post_setting ) {
-			if ( isset( $form_options[ $post_setting ] ) ) {
-				$new_action['post_content'][ $post_setting ] = $form_options[ $post_setting ];
+			if ( isset( $form_options[$post_setting] ) ) {
+				$new_action['post_content'][$post_setting] = $form_options[$post_setting];
             }
-            unset($post_setting);
+            unset( $post_setting );
         }
 
 		$new_action['event'] = array( 'create', 'update' );
@@ -972,7 +972,7 @@ 
 
 			$new_action['post_content'] = self::switch_action_field_ids( $new_action['post_content'], $basic_fields, $array_fields );
         }
-        $new_action['post_content'] = json_encode($new_action['post_content']);
+        $new_action['post_content'] = json_encode( $new_action['post_content'] );
 
         $exists = get_posts( array(
             'name'          => $new_action['post_name'],
@@ -984,7 +984,7 @@ 
         if ( ! $exists ) {
 			// this isn't an email, but we need to use a class that will always be included
 			FrmAppHelper::save_json_post( $new_action );
-            $imported['imported']['actions']++;
+            $imported['imported']['actions'] ++;
         }
     }
 
@@ -1016,11 +1016,11 @@ 
         foreach ( $post_content as $key => $setting ) {
             if ( ! is_array( $setting ) && in_array( $key, $basic_fields ) ) {
                 // Replace old IDs with new IDs
-				$post_content[ $key ] = str_replace( $old, $new, $setting );
+				$post_content[$key] = str_replace( $old, $new, $setting );
             } else if ( is_array( $setting ) && in_array( $key, $array_fields ) ) {
                 foreach ( $setting as $k => $val ) {
                     // Replace old IDs with new IDs
-					$post_content[ $key ][ $k ] = str_replace( $old, $new, $val );
+					$post_content[$key][$k] = str_replace( $old, $new, $val );
                 }
             }
             unset( $key, $setting );
@@ -1050,7 +1050,7 @@ 
         foreach ( $notifications as $new_notification ) {
             $new_notification['post_type']      = $post_type;
             $new_notification['post_excerpt']   = 'email';
-			$new_notification['post_title']     = __( 'Email Notification', 'formidable' );
+			$new_notification['post_title'] = __( 'Email Notification', 'formidable' );
             $new_notification['menu_order']     = $form_id;
             $new_notification['post_status']    = 'publish';
 
@@ -1063,7 +1063,7 @@ 
 				// Switch all other field IDs in email
                 $new_notification['post_content'] = FrmFieldsHelper::switch_field_ids( $new_notification['post_content'] );
             }
-            $new_notification['post_content']   = FrmAppHelper::prepare_and_encode( $new_notification['post_content'] );
+            $new_notification['post_content'] = FrmAppHelper::prepare_and_encode( $new_notification['post_content'] );
 
             $exists = get_posts( array(
                 'name'          => $new_notification['post_name'],
@@ -1072,11 +1072,11 @@ 
                 'numberposts'   => 1,
             ) );
 
-            if ( empty($exists) ) {
+            if ( empty( $exists ) ) {
 				FrmAppHelper::save_json_post( $new_notification );
-                $imported['imported']['actions']++;
+                $imported['imported']['actions'] ++;
             }
-            unset($new_notification);
+            unset( $new_notification );
         }
     }
 
@@ -1089,7 +1089,7 @@ 
 			$form_options['notification'] = array( 0 => $form_options['notification'] );
         }
 
-        if ( isset( $form_options['notification'] ) && is_array($form_options['notification']) ) {
+        if ( isset( $form_options['notification'] ) && is_array( $form_options['notification'] ) ) {
             foreach ( $form_options['notification'] as $email_key => $notification ) {
 
                 $atts = array( 'email_to' => '', 'reply_to' => '', 'reply_to_name' => '', 'event' => '', 'form_id' => $form_id, 'email_key' => $email_key );
@@ -1117,12 +1117,12 @@ 
         // Format the reply to email and name
         $reply_fields = array( 'reply_to' => '', 'reply_to_name' => '' );
         foreach ( $reply_fields as $f => $val ) {
-			if ( isset( $notification[ $f ] ) ) {
-				$atts[ $f ] = $notification[ $f ];
-				if ( 'custom' == $notification[ $f ] ) {
-					$atts[ $f ] = $notification[ 'cust_' . $f ];
-				} else if ( is_numeric( $atts[ $f ] ) && ! empty( $atts[ $f ] ) ) {
-					$atts[ $f ] = '[' . $atts[ $f ] . ']';
+			if ( isset( $notification[$f] ) ) {
+				$atts[$f] = $notification[$f];
+				if ( 'custom' == $notification[$f] ) {
+					$atts[$f] = $notification['cust_' . $f];
+				} else if ( is_numeric( $atts[$f] ) && ! empty( $atts[$f] ) ) {
+					$atts[$f] = '[' . $atts[$f] . ']';
                 }
             }
             unset( $f, $val );
@@ -1132,7 +1132,7 @@ 
 		$atts['event'] = array( 'create' );
         if ( isset( $notification['update_email'] ) && 1 == $notification['update_email'] ) {
             $atts['event'][] = 'update';
-        } else if ( isset($notification['update_email']) && 2 == $notification['update_email'] ) {
+        } else if ( isset( $notification['update_email'] ) && 2 == $notification['update_email'] ) {
 			$atts['event'] = array( 'update' );
         }
     }
@@ -1153,18 +1153,18 @@ 
         foreach ( $atts['email_to'] as $key => $email_field ) {
 
             if ( is_numeric( $email_field ) ) {
-				$atts['email_to'][ $key ] = '[' . $email_field . ']';
+				$atts['email_to'][$key] = '[' . $email_field . ']';
             }
 
-            if ( strpos( $email_field, '|') ) {
+            if ( strpos( $email_field, '|' ) ) {
                 $email_opt = explode( '|', $email_field );
                 if ( isset( $email_opt[0] ) ) {
-					$atts['email_to'][ $key ] = '[' . $email_opt[0] . ' show=' . $email_opt[1] . ']';
+					$atts['email_to'][$key] = '[' . $email_opt[0] . ' show=' . $email_opt[1] . ']';
                 }
                 unset( $email_opt );
             }
         }
-        $atts['email_to'] = implode(', ', $atts['email_to']);
+        $atts['email_to'] = implode( ', ', $atts['email_to'] );
     }
 
     private static function setup_new_notification( &$new_notification, $notification, $atts ) {
@@ -1180,12 +1180,12 @@ 
         // Add more fields to the new notification
         $add_fields = array( 'email_message', 'email_subject', 'plain_text', 'inc_user_info', 'conditions' );
         foreach ( $add_fields as $add_field ) {
-			if ( isset( $notification[ $add_field ] ) ) {
-				$new_notification['post_content'][ $add_field ] = $notification[ $add_field ];
+			if ( isset( $notification[$add_field] ) ) {
+				$new_notification['post_content'][$add_field] = $notification[$add_field];
             } else if ( in_array( $add_field, array( 'plain_text', 'inc_user_info' ) ) ) {
-				$new_notification['post_content'][ $add_field ] = 0;
+				$new_notification['post_content'][$add_field] = 0;
             } else {
-				$new_notification['post_content'][ $add_field ] = '';
+				$new_notification['post_content'][$add_field] = '';
             }
             unset( $add_field );
         }
@@ -1209,26 +1209,26 @@ 
 		if ( isset( $post_content['conditions'] ) && is_array( $post_content['conditions'] ) ) {
 			foreach ( $post_content['conditions'] as $email_key => $val ) {
 				if ( is_numeric( $email_key ) ) {
-					$post_content['conditions'][ $email_key ] = self::switch_action_field_ids( $val, array( 'hide_field' ) );
+					$post_content['conditions'][$email_key] = self::switch_action_field_ids( $val, array( 'hide_field' ) );
 				}
-				unset( $email_key, $val);
+				unset( $email_key, $val );
 			}
 		}
 	}
 
     private static function migrate_autoresponder_to_action( $form_options, $form_id, &$notifications ) {
-        if ( isset($form_options['auto_responder']) && $form_options['auto_responder'] && isset($form_options['ar_email_message']) && $form_options['ar_email_message'] ) {
+        if ( isset( $form_options['auto_responder'] ) && $form_options['auto_responder'] && isset( $form_options['ar_email_message'] ) && $form_options['ar_email_message'] ) {
             // migrate autoresponder
 
-            $email_field = isset($form_options['ar_email_to']) ? $form_options['ar_email_to'] : 0;
-            if ( strpos($email_field, '|') ) {
+            $email_field = isset( $form_options['ar_email_to'] ) ? $form_options['ar_email_to'] : 0;
+            if ( strpos( $email_field, '|' ) ) {
                 // data from entries field
-                $email_field = explode('|', $email_field);
-                if ( isset($email_field[1]) ) {
+                $email_field = explode( '|', $email_field );
+                if ( isset( $email_field[1] ) ) {
                     $email_field = $email_field[1];
                 }
             }
-            if ( is_numeric($email_field) && ! empty($email_field) ) {
+            if ( is_numeric( $email_field ) && ! empty( $email_field ) ) {
 				$email_field = '[' . $email_field . ']';
             }
 
@@ -1236,16 +1236,16 @@ 
             $new_notification2 = array(
                 'post_content'  => array(
                     'email_message' => $notification['ar_email_message'],
-                    'email_subject' => isset($notification['ar_email_subject']) ? $notification['ar_email_subject'] : '',
+                    'email_subject' => isset( $notification['ar_email_subject'] ) ? $notification['ar_email_subject'] : '',
                     'email_to'      => $email_field,
-                    'plain_text'    => isset($notification['ar_plain_text']) ? $notification['ar_plain_text'] : 0,
+                    'plain_text'    => isset( $notification['ar_plain_text'] ) ? $notification['ar_plain_text'] : 0,
                     'inc_user_info' => 0,
                 ),
 				'post_name'     => $form_id . '_email_' . count( $notifications ),
             );
 
-            $reply_to = isset($notification['ar_reply_to']) ? $notification['ar_reply_to'] : '';
-            $reply_to_name = isset($notification['ar_reply_to_name']) ? $notification['ar_reply_to_name'] : '';
+            $reply_to = isset( $notification['ar_reply_to'] ) ? $notification['ar_reply_to'] : '';
+            $reply_to_name = isset( $notification['ar_reply_to_name'] ) ? $notification['ar_reply_to_name'] : '';
 
 			if ( ! empty( $reply_to ) ) {
 				$new_notification2['post_content']['reply_to'] = $reply_to;

classes/views/frm-entries/new.php

Spacing +3 added lines, -3 removed lines

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

classes/widgets/FrmShowForm.php

Indentation +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
 	}
 
 	public function widget( $args, $instance ) {
-        $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
+		$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
 
 		echo $args['before_widget'];
 
@@ -34,9 +34,9 @@ 
 	}
 
 	public function form( $instance ) {
-	    //Defaults
+		//Defaults
 		$instance = wp_parse_args( (array) $instance, array(
-		    'title' => false, 'form' => false, 'description' => false,
+			'title' => false, 'form' => false, 'description' => false,
 		) );
 ?>
 	<p><label for="<?php echo esc_attr( $this->get_field_id('title') ); ?>"><?php _e( 'Title', 'formidable' ) ?>:</label><br/>
@@ -44,10 +44,10 @@ 
 
 	<p><label for="<?php echo esc_attr( $this->get_field_id('form') ); ?>"><?php _e( 'Form', 'formidable' ) ?>:</label><br/>
 <?php
-	    FrmFormsHelper::forms_dropdown( $this->get_field_name('form'), $instance['form'], array(
-	        'blank' => false, 'field_id' => $this->get_field_id('form'),
-            'class' => 'widefat',
-	    ) );
+		FrmFormsHelper::forms_dropdown( $this->get_field_name('form'), $instance['form'], array(
+			'blank' => false, 'field_id' => $this->get_field_id('form'),
+			'class' => 'widefat',
+		) );
 ?>
 	</p>
 

Spacing +8 added lines, -8 removed lines

@@ -4,7 +4,7 @@ 
 
 	public function __construct() {
 		$widget_ops = array( 'description' => __( 'Display a Formidable Form', 'formidable' ) );
-		parent::__construct('frm_show_form', __( 'Formidable Form', 'formidable' ), $widget_ops);
+		parent::__construct( 'frm_show_form', __( 'Formidable Form', 'formidable' ), $widget_ops );
 	}
 
 	public function widget( $args, $instance ) {
@@ -14,7 +14,7 @@ 
 
 		echo '<div class="frm_form_widget">';
 		if ( $title ) {
-			echo $args['before_title'] . stripslashes($title) . $args['after_title'];
+			echo $args['before_title'] . stripslashes( $title ) . $args['after_title'];
 		}
 
 		$form_atts = array(
@@ -39,19 +39,19 @@ 
 		    'title' => false, 'form' => false, 'description' => false,
 		) );
 ?>
-	<p><label for="<?php echo esc_attr( $this->get_field_id('title') ); ?>"><?php _e( 'Title', 'formidable' ) ?>:</label><br/>
-	<input type="text" class="widefat" id="<?php echo esc_attr( $this->get_field_id('title') ); ?>" name="<?php echo esc_attr( $this->get_field_name('title') ); ?>" value="<?php echo esc_attr( stripslashes($instance['title']) ); ?>" /></p>
+	<p><label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title', 'formidable' ) ?>:</label><br/>
+	<input type="text" class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" value="<?php echo esc_attr( stripslashes( $instance['title'] ) ); ?>" /></p>
 
-	<p><label for="<?php echo esc_attr( $this->get_field_id('form') ); ?>"><?php _e( 'Form', 'formidable' ) ?>:</label><br/>
+	<p><label for="<?php echo esc_attr( $this->get_field_id( 'form' ) ); ?>"><?php _e( 'Form', 'formidable' ) ?>:</label><br/>
 <?php
-	    FrmFormsHelper::forms_dropdown( $this->get_field_name('form'), $instance['form'], array(
-	        'blank' => false, 'field_id' => $this->get_field_id('form'),
+	    FrmFormsHelper::forms_dropdown( $this->get_field_name( 'form' ), $instance['form'], array(
+	        'blank' => false, 'field_id' => $this->get_field_id( 'form' ),
             'class' => 'widefat',
 	    ) );
 ?>
 	</p>
 
-	<p><label for="<?php echo esc_attr( $this->get_field_id('description') ); ?>"><input class="checkbox" type="checkbox" <?php checked($instance['description'], true) ?> id="<?php echo esc_attr( $this->get_field_id('description') ); ?>" name="<?php echo esc_attr( $this->get_field_name('description') ); ?>" value="1" />
+	<p><label for="<?php echo esc_attr( $this->get_field_id( 'description' ) ); ?>"><input class="checkbox" type="checkbox" <?php checked( $instance['description'], true ) ?> id="<?php echo esc_attr( $this->get_field_id( 'description' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'description' ) ); ?>" value="1" />
 	<?php _e( 'Show Description', 'formidable' ) ?></label></p>
 <?php
 	}

classes/controllers/FrmAddonsController.php

Spacing +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
 			}
 			$addon['link'] = FrmAppHelper::make_affiliate_url( $addon['link'] );
 
-			$addons[ $slug ] = $addon;
+			$addons[$slug] = $addon;
 		}
 	}
 

classes/controllers/FrmSettingsController.php

Indentation +40 added lines, -40 removed lines

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

Spacing +3 added lines, -3 removed lines

@@ -45,16 +45,16 @@
 	}
 
 	public static function load_settings_tab() {
-		FrmAppHelper::permission_check('frm_change_settings');
+		FrmAppHelper::permission_check( 'frm_change_settings' );
 		check_ajax_referer( 'frm_ajax', 'nonce' );
 
 		$section = FrmAppHelper::get_post_param( 'tab', '', 'sanitize_text_field' );
 		$sections = self::get_settings_tabs();
-		if ( ! isset( $sections[ $section ] ) ) {
+		if ( ! isset( $sections[$section] ) ) {
 			wp_die();
 		}
 
-		$section = $sections[ $section ];
+		$section = $sections[$section];
 
 		if ( isset( $section['class'] ) ) {
 			call_user_func( array( $section['class'], $section['function'] ) );

classes/views/frm-settings/form.php

Indentation +2 added lines, -2 removed lines

@@ -191,10 +191,10 @@
 					} else {
 						call_user_func( ( isset( $section['function'] ) ? $section['function'] : $section ) );
 					}
-                } ?>
+				} ?>
             </div>
         <?php
-        } ?>
+		} ?>
 
         <p class="alignright frm_uninstall">
             <a href="javascript:void(0)" id="frm_uninstall_now"><?php _e( 'Uninstall Formidable', 'formidable' ) ?></a>

Spacing +14 added lines, -14 removed lines

@@ -27,14 +27,14 @@ 
         </ul>
         </div>
 
-    <?php do_action('frm_before_settings'); ?>
+    <?php do_action( 'frm_before_settings' ); ?>
 
 	<form name="frm_settings_form" method="post" class="frm_settings_form" action="?page=formidable-settings<?php echo ( $a ? '&amp;t=' . $a : '' ); ?>">
         <input type="hidden" name="frm_action" value="process-form" />
         <input type="hidden" name="action" value="process-form" />
-        <?php wp_nonce_field('process_form_nonce', 'process_form'); ?>
+        <?php wp_nonce_field( 'process_form_nonce', 'process_form' ); ?>
 
-        <div class="general_settings tabs-panel <?php echo ($a == 'general_settings') ? 'frm_block' : 'frm_hidden'; ?>">
+        <div class="general_settings tabs-panel <?php echo ( $a == 'general_settings' ) ? 'frm_block' : 'frm_hidden'; ?>">
             <p class="submit">
 				<input class="button-primary" type="submit" value="<?php esc_attr_e( 'Update Options', 'formidable' ) ?>" />
             </p>
@@ -43,20 +43,20 @@ 
 
             <p><label class="frm_left_label"><?php _e( 'Load form styling', 'formidable' ) ?></label>
                 <select id="frm_load_style" name="frm_load_style">
-                <option value="all" <?php selected($frm_settings->load_style, 'all') ?>><?php _e( 'on every page of your site', 'formidable' ) ?></option>
-                <option value="dynamic" <?php selected($frm_settings->load_style, 'dynamic') ?>><?php _e( 'only on applicable pages', 'formidable' ) ?></option>
-                <option value="none" <?php selected($frm_settings->load_style, 'none') ?>><?php _e( 'Don\'t use form styling on any page', 'formidable' ) ?></option>
+                <option value="all" <?php selected( $frm_settings->load_style, 'all' ) ?>><?php _e( 'on every page of your site', 'formidable' ) ?></option>
+                <option value="dynamic" <?php selected( $frm_settings->load_style, 'dynamic' ) ?>><?php _e( 'only on applicable pages', 'formidable' ) ?></option>
+                <option value="none" <?php selected( $frm_settings->load_style, 'none' ) ?>><?php _e( 'Don\'t use form styling on any page', 'formidable' ) ?></option>
                 </select>
             </p>
 
             <p>
 				<label for="frm_use_html">
-					<input type="checkbox" id="frm_use_html" name="frm_use_html" value="1" <?php checked($frm_settings->use_html, 1) ?>	> <?php _e( 'Use HTML5 in forms', 'formidable' ) ?>
+					<input type="checkbox" id="frm_use_html" name="frm_use_html" value="1" <?php checked( $frm_settings->use_html, 1 ) ?>	> <?php _e( 'Use HTML5 in forms', 'formidable' ) ?>
 				</label>
 				<span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'We recommend using HTML 5 for your forms. It adds some nifty options like placeholders, patterns, and autocomplete.', 'formidable' ) ?>"></span>
             </p>
 
-            <?php do_action('frm_style_general_settings', $frm_settings); ?>
+            <?php do_action( 'frm_style_general_settings', $frm_settings ); ?>
 
 			<h3><?php _e( 'User Permissions', 'formidable' ); ?>
 				<span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'Select users that are allowed access to Formidable. Without access to View Forms, users will be unable to see the Formidable menu.', 'formidable' ) ?>"></span>
@@ -80,10 +80,10 @@ 
 			</p>
 
 			<p><label class="frm_left_label"><?php _e( 'Site Key', 'formidable' ) ?></label>
-			<input type="text" name="frm_pubkey" id="frm_pubkey" size="42" value="<?php echo esc_attr($frm_settings->pubkey) ?>" placeholder="<?php esc_attr_e( 'Optional', 'formidable' ) ?>" /></p>
+			<input type="text" name="frm_pubkey" id="frm_pubkey" size="42" value="<?php echo esc_attr( $frm_settings->pubkey ) ?>" placeholder="<?php esc_attr_e( 'Optional', 'formidable' ) ?>" /></p>
 
 			<p><label class="frm_left_label"><?php _e( 'Secret Key', 'formidable' ) ?></label>
-			<input type="text" name="frm_privkey" id="frm_privkey" size="42" value="<?php echo esc_attr($frm_settings->privkey) ?>" placeholder="<?php esc_attr_e( 'Optional', 'formidable' ) ?>" /></p>
+			<input type="text" name="frm_privkey" id="frm_privkey" size="42" value="<?php echo esc_attr( $frm_settings->privkey ) ?>" placeholder="<?php esc_attr_e( 'Optional', 'formidable' ) ?>" /></p>
 
 		    <p><label class="frm_left_label"><?php _e( 'reCAPTCHA Type', 'formidable' ) ?></label>
 			<select name="frm_re_type" id="frm_re_type">
@@ -99,7 +99,7 @@ 
 			<select name="frm_re_lang" id="frm_re_lang">
 				<option value="" <?php selected( $frm_settings->re_lang, '' ) ?>><?php esc_html_e( 'Browser Default', 'formidable' ); ?></option>
 			    <?php foreach ( $captcha_lang as $lang => $lang_name ) { ?>
-				<option value="<?php echo esc_attr($lang) ?>" <?php selected($frm_settings->re_lang, $lang) ?>><?php echo esc_html( $lang_name ) ?></option>
+				<option value="<?php echo esc_attr( $lang ) ?>" <?php selected( $frm_settings->re_lang, $lang ) ?>><?php echo esc_html( $lang_name ) ?></option>
                 <?php } ?>
             </select></p>
 
@@ -152,7 +152,7 @@ 
 			<label class="frm_left_label"><?php _e( 'Success Message', 'formidable' ); ?>
 				<span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'The default message seen after a form is submitted.', 'formidable' ) ?>" ></span>
 			</label>
-            <input type="text" id="frm_success_msg" name="frm_success_msg" class="frm_with_left_label" value="<?php echo esc_attr($frm_settings->success_msg) ?>" />
+            <input type="text" id="frm_success_msg" name="frm_success_msg" class="frm_with_left_label" value="<?php echo esc_attr( $frm_settings->success_msg ) ?>" />
 		</p>
 
 		<p>
@@ -160,7 +160,7 @@ 
 			<input type="text" value="<?php echo esc_attr( $frm_settings->submit_value ) ?>" id="frm_submit_value" name="frm_submit_value" class="frm_with_left_label" />
 		</p>
 
-        <?php do_action('frm_settings_form', $frm_settings); ?>
+        <?php do_action( 'frm_settings_form', $frm_settings ); ?>
 
         <?php if ( ! FrmAppHelper::pro_is_installed() ) { ?>
 			<div class="clear"></div>
@@ -170,7 +170,7 @@ 
 		<?php } ?>
 
         <p><label class="frm_left_label"><?php _e( 'Preview Page', 'formidable' ); ?></label>
-        <?php FrmAppHelper::wp_pages_dropdown('frm-preview-page-id', $frm_settings->preview_page_id ) ?>
+        <?php FrmAppHelper::wp_pages_dropdown( 'frm-preview-page-id', $frm_settings->preview_page_id ) ?>
         </p>
 
     </div>

classes/models/FrmEntryFormat.php

Doc Comments +1 added lines

@@ -151,6 +151,7 @@
 
 	/**
 	 * @deprecated 2.03.11
+	 * @param string $val
 	 */
 	private static function get_field_value( $atts, &$val ) {
 		_deprecated_function( __FUNCTION__, '2.03.11', 'instance of FrmEntryValues or FrmProEntryValues' );

Spacing +8 added lines, -8 removed lines

@@ -98,15 +98,15 @@ 
 		self::prepare_field_output( $atts, $val );
 
 		if ( $atts['format'] != 'text' ) {
-			$values[ $f->field_key ] = $val;
+			$values[$f->field_key] = $val;
 			if ( $atts['entry'] && $f->type != 'textarea' ) {
-				$prev_val = maybe_unserialize( $atts['entry']->metas[ $f->id ] );
+				$prev_val = maybe_unserialize( $atts['entry']->metas[$f->id] );
 				if ( $prev_val != $val ) {
-					$values[ $f->field_key . '-value' ] = $prev_val;
+					$values[$f->field_key . '-value'] = $prev_val;
 				}
 			}
 		} else {
-			$values[ $f->id ] = array( 'label' => $f->name, 'val' => $val, 'type' => $f->type );
+			$values[$f->id] = array( 'label' => $f->name, 'val' => $val, 'type' => $f->type );
 		}
 	}
 
@@ -116,9 +116,9 @@ 
 	private static function fill_missing_fields( $atts, &$values ) {
 		_deprecated_function( __FUNCTION__, '2.03.11', 'instance of FrmEntryValues or FrmProEntryValues' );
 
-		if ( $atts['entry'] && ! isset( $atts['entry']->metas[ $atts['field']->id ] ) ) {
+		if ( $atts['entry'] && ! isset( $atts['entry']->metas[$atts['field']->id] ) ) {
 			// In case include_blank is set
-			$atts['entry']->metas[ $atts['field']->id ] = '';
+			$atts['entry']->metas[$atts['field']->id] = '';
 			$atts['entry'] = apply_filters( 'frm_prepare_entry_content', $atts['entry'], array( 'field' => $atts['field'] ) );
 			self::fill_values_from_entry( $atts, $values );
 		}
@@ -146,7 +146,7 @@ 
 			'type'  => $f->type,
 		);
 
-		$values[ $f->id ] = apply_filters( 'frm_field_shortcodes_for_default_html_email', $field_shortcodes, $f );
+		$values[$f->id] = apply_filters( 'frm_field_shortcodes_for_default_html_email', $field_shortcodes, $f );
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 
 		$f = $atts['field'];
 		if ( $atts['entry'] ) {
-			$prev_val = maybe_unserialize( $atts['entry']->metas[ $f->id ] );
+			$prev_val = maybe_unserialize( $atts['entry']->metas[$f->id] );
 			$meta = array( 'item_id' => $atts['id'], 'field_id' => $f->id, 'meta_value' => $prev_val, 'field_type' => $f->type );
 
 			//This filter applies to the default-message shortcode and frm-show-entry shortcode only