Strategy11 / formidable-forms

classes/models/FrmEntry.php

Doc Comments +1 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 ) {

Indentation +377 added lines, -377 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,46 +125,46 @@ 
 		return true;
 	}
 
-    public static function duplicate( $id ) {
-        global $wpdb;
+	public static function duplicate( $id ) {
+		global $wpdb;
 
-        $values = self::getOne( $id );
+		$values = self::getOne( $id );
 
-        $new_values = array();
+		$new_values = array();
 		$new_values['item_key'] = FrmAppHelper::get_unique_key( '', $wpdb->prefix . 'frm_items', 'item_key' );
-        $new_values['name'] = $values->name;
-        $new_values['is_draft'] = $values->is_draft;
-        $new_values['user_id'] = $new_values['updated_by'] = (int) $values->user_id;
-        $new_values['form_id'] = $values->form_id ? (int) $values->form_id: null;
-        $new_values['created_at'] = $new_values['updated_at'] = current_time('mysql', 1);
+		$new_values['name'] = $values->name;
+		$new_values['is_draft'] = $values->is_draft;
+		$new_values['user_id'] = $new_values['updated_by'] = (int) $values->user_id;
+		$new_values['form_id'] = $values->form_id ? (int) $values->form_id: null;
+		$new_values['created_at'] = $new_values['updated_at'] = current_time('mysql', 1);
 
 		$query_results = $wpdb->insert( $wpdb->prefix . 'frm_items', $new_values );
-        if ( ! $query_results ) {
-            return false;
-        }
+		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' );
 
@@ -172,14 +172,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;
 
@@ -198,34 +198,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
@@ -261,161 +261,161 @@ 
 	}
 
 	public static function getOne( $id, $meta = false ) {
-        global $wpdb;
+		global $wpdb;
 
-        $query = "SELECT it.*, fr.name as form_name, fr.form_key as form_key FROM {$wpdb->prefix}frm_items it
+		$query = "SELECT it.*, fr.name as form_name, fr.form_key as form_key FROM {$wpdb->prefix}frm_items it
                   LEFT OUTER JOIN {$wpdb->prefix}frm_forms fr ON it.form_id=fr.id WHERE ";
 
-        $query .= is_numeric($id) ? 'it.id=%d' : 'it.item_key=%s';
-        $query_args = array( $id );
-        $query = $wpdb->prepare( $query, $query_args );
+		$query .= is_numeric($id) ? 'it.id=%d' : 'it.item_key=%s';
+		$query_args = array( $id );
+		$query = $wpdb->prepare( $query, $query_args );
 
-        if ( ! $meta ) {
+		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 );
-        foreach ( $metas as $meta_val ) {
-            if ( $meta_val->item_id == $entry->id ) {
+		foreach ( $metas as $meta_val ) {
+			if ( $meta_val->item_id == $entry->id ) {
 				$entry->metas[ $meta_val->field_id ] = maybe_unserialize( $meta_val->meta_value );
 				if ( $include_key ) {
 					$entry->metas[ $meta_val->field_key ] = $entry->metas[ $meta_val->field_id ];
 				}
-                 continue;
-            }
+				 continue;
+			}
 
-            // include sub entries in an array
+			// include sub entries in an array
 			if ( ! isset( $entry_metas[ $meta_val->field_id ] ) ) {
 				$entry->metas[ $meta_val->field_id ] = array();
-            }
+			}
 
 			$entry->metas[ $meta_val->field_id ][] = maybe_unserialize( $meta_val->meta_value );
 
-            unset($meta_val);
-        }
-        unset($metas);
+			unset($meta_val);
+		}
+		unset($metas);
 
-        wp_cache_set( $entry->id, $entry, 'frm_entry');
+		wp_cache_set( $entry->id, $entry, 'frm_entry');
 
-        return $entry;
-    }
+		return $entry;
+	}
 
-    /**
-     * @param string $id
-     */
+	/**
+	 * @param string $id
+	 */
 	public static function &exists( $id ) {
-        global $wpdb;
-
-        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);
 
 			if ( ! FrmAppHelper::prevent_caching() ) {
 				wp_cache_set( $cache_key, $entries, 'frm_entry', 300 );
 			}
-        }
+		}
 
-        if ( ! $meta || ! $entries ) {
-            return stripslashes_deep($entries);
-        }
-        unset($meta);
+		if ( ! $meta || ! $entries ) {
+			return stripslashes_deep($entries);
+		}
+		unset($meta);
 
-        if ( ! is_array( $where ) && preg_match('/^it\.form_id=\d+$/', $where) ) {
+		if ( ! is_array( $where ) && preg_match('/^it\.form_id=\d+$/', $where) ) {
 			$where = array( 'it.form_id' => substr( $where, 11 ) );
-        }
+		}
 
-        $meta_where = array( 'field_id !' => 0 );
-        if ( $limit == '' && is_array($where) && count($where) == 1 && isset($where['it.form_id']) ) {
-            $meta_where['fi.form_id'] = $where['it.form_id'];
-        } else {
-            $meta_where['item_id'] = array_keys( $entries );
-        }
+		$meta_where = array( 'field_id !' => 0 );
+		if ( $limit == '' && is_array($where) && count($where) == 1 && isset($where['it.form_id']) ) {
+			$meta_where['fi.form_id'] = $where['it.form_id'];
+		} else {
+			$meta_where['item_id'] = array_keys( $entries );
+		}
 
-        $metas = FrmDb::get_results( $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON (it.field_id = fi.id)', $meta_where, 'item_id, meta_value, field_id, field_key, form_id' );
+		$metas = FrmDb::get_results( $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON (it.field_id = fi.id)', $meta_where, 'item_id, meta_value, field_id, field_key, form_id' );
 
-        unset( $meta_where );
+		unset( $meta_where );
 
-        if ( ! $metas ) {
-            return stripslashes_deep($entries);
-        }
+		if ( ! $metas ) {
+			return stripslashes_deep($entries);
+		}
 
-        foreach ( $metas as $m_key => $meta_val ) {
-            if ( ! isset( $entries[ $meta_val->item_id ] ) ) {
-                continue;
-            }
+		foreach ( $metas as $m_key => $meta_val ) {
+			if ( ! isset( $entries[ $meta_val->item_id ] ) ) {
+				continue;
+			}
 
-            if ( ! isset( $entries[ $meta_val->item_id ]->metas ) ) {
+			if ( ! isset( $entries[ $meta_val->item_id ]->metas ) ) {
 				$entries[ $meta_val->item_id ]->metas = array();
-            }
+			}
 
 			$entries[ $meta_val->item_id ]->metas[ $meta_val->field_id ] = maybe_unserialize( $meta_val->meta_value );
 
-            unset($m_key, $meta_val);
-        }
+			unset($m_key, $meta_val);
+		}
 
 		if ( ! FrmAppHelper::prevent_caching() ) {
 			foreach ( $entries as $entry ) {
@@ -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 );
-    }
-
-	/**
-	* Prepare the new values for inserting into the database
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return array $new_values
-	*/
+	/**
+	 * Sanitize the POST values before we use them
+	 *
+	 * @since 2.0
+	 * @param array $values The POST values by reference
+	 */
+	public static function sanitize_entry_post( &$values ) {
+		$sanitize_method = array(
+			'form_id'       => 'absint',
+			'frm_action'    => 'sanitize_title',
+			'form_key'      => 'sanitize_title',
+			'item_key'      => 'sanitize_title',
+			'item_name'     => 'sanitize_text_field',
+			'frm_saving_draft' => 'absint',
+			'is_draft'      => 'absint',
+			'post_id'       => 'absint',
+			'parent_item_id' => 'absint',
+			'created_at'    => 'sanitize_text_field',
+			'updated_at'    => 'sanitize_text_field',
+		);
+
+		FrmAppHelper::sanitize_request( $sanitize_method, $values );
+	}
+
+	/**
+	 * Prepare the new values for inserting into the database
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return array $new_values
+	 */
 	private static function package_entry_data( &$values ) {
 		global $wpdb;
 
@@ -564,67 +564,67 @@ 
 	}
 
 	/**
-	* Get the is_draft value for a new entry
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return int
-	*/
+	 * Get the is_draft value for a new entry
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return int
+	 */
 	private static function get_is_draft_value( $values ) {
 		return ( ( isset( $values['frm_saving_draft'] ) && $values['frm_saving_draft'] == 1 ) ||  ( isset( $values['is_draft'] ) && $values['is_draft'] == 1 ) ) ? 1 : 0;
 	}
 
 	/**
-	* Get the form_id value for a new entry
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return int|null
-	*/
+	 * Get the form_id value for a new entry
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return int|null
+	 */
 	private static function get_form_id( $values ) {
 		return isset( $values['form_id'] ) ? (int) $values['form_id'] : null;
 	}
 
 	/**
-	* Get the post_id value for a new entry
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return int
-	*/
+	 * Get the post_id value for a new entry
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return int
+	 */
 	private static function get_post_id( $values ) {
 		return isset( $values['post_id'] ) ? (int) $values['post_id']: 0;
 	}
 
 	/**
-	* Get the parent_item_id value for a new entry
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return int
-	*/
+	 * Get the parent_item_id value for a new entry
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return int
+	 */
 	private static function get_parent_item_id( $values ) {
 		return isset( $values['parent_item_id'] ) ? (int) $values['parent_item_id']: 0;
 	}
 
 	/**
-	* Get the created_at value for a new entry
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return string
-	*/
+	 * Get the created_at value for a new entry
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return string
+	 */
 	private static function get_created_at( $values ) {
 		return isset( $values['created_at'] ) ? $values['created_at']: current_time('mysql', 1);
 	}
 
 	/**
-	* Get the updated_at value for a new entry
-	*
-	* @since 2.0.16
-	* @param array $values
-	* @return string
-	*/
+	 * Get the updated_at value for a new entry
+	 *
+	 * @since 2.0.16
+	 * @param array $values
+	 * @return string
+	 */
 	private static function get_updated_at( $values ) {
 		if ( isset( $values['updated_at'] ) ) {
 			$updated_at = $values['updated_at'];
@@ -636,12 +636,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'] );
@@ -656,12 +656,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'];
@@ -674,12 +674,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;
 
@@ -695,11 +695,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;
 
@@ -711,12 +711,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'] );
@@ -724,12 +724,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' );
@@ -739,13 +739,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 );
@@ -758,14 +758,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;
 
@@ -783,13 +783,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;
 
@@ -823,14 +823,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();
@@ -852,13 +852,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' );
 
@@ -866,28 +866,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 +67 added lines, -67 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;
 		}
 
@@ -135,8 +135,8 @@ 
         $new_values['name'] = $values->name;
         $new_values['is_draft'] = $values->is_draft;
         $new_values['user_id'] = $new_values['updated_by'] = (int) $values->user_id;
-        $new_values['form_id'] = $values->form_id ? (int) $values->form_id: null;
-        $new_values['created_at'] = $new_values['updated_at'] = current_time('mysql', 1);
+        $new_values['form_id'] = $values->form_id ? (int) $values->form_id : null;
+        $new_values['created_at'] = $new_values['updated_at'] = current_time( 'mysql', 1 );
 
 		$query_results = $wpdb->insert( $wpdb->prefix . 'frm_items', $new_values );
         if ( ! $query_results ) {
@@ -146,12 +146,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 ) );
@@ -190,7 +190,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 );
 
@@ -207,7 +207,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 ) );
@@ -219,7 +219,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();
@@ -266,24 +266,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 ) {
@@ -299,25 +299,25 @@ 
 		$include_key = apply_filters( 'frm_include_meta_keys', false );
         foreach ( $metas as $meta_val ) {
             if ( $meta_val->item_id == $entry->id ) {
-				$entry->metas[ $meta_val->field_id ] = maybe_unserialize( $meta_val->meta_value );
+				$entry->metas[$meta_val->field_id] = maybe_unserialize( $meta_val->meta_value );
 				if ( $include_key ) {
-					$entry->metas[ $meta_val->field_key ] = $entry->metas[ $meta_val->field_id ];
+					$entry->metas[$meta_val->field_key] = $entry->metas[$meta_val->field_id];
 				}
                  continue;
             }
 
             // include sub entries in an array
-			if ( ! isset( $entry_metas[ $meta_val->field_id ] ) ) {
-				$entry->metas[ $meta_val->field_id ] = array();
+			if ( ! isset( $entry_metas[$meta_val->field_id] ) ) {
+				$entry->metas[$meta_val->field_id] = array();
             }
 
-			$entry->metas[ $meta_val->field_id ][] = maybe_unserialize( $meta_val->meta_value );
+			$entry->metas[$meta_val->field_id][] = maybe_unserialize( $meta_val->meta_value );
 
-            unset($meta_val);
+            unset( $meta_val );
         }
-        unset($metas);
+        unset( $metas );
 
-        wp_cache_set( $entry->id, $entry, 'frm_entry');
+        wp_cache_set( $entry->id, $entry, 'frm_entry' );
 
         return $entry;
     }
@@ -333,24 +333,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';
@@ -369,10 +369,10 @@ 
 		    }
 
 			// prepare the query
-			$query = 'SELECT ' . $fields . ' FROM ' . $table . FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+			$query = 'SELECT ' . $fields . ' FROM ' . $table . FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
 
-            $entries = $wpdb->get_results($query, OBJECT_K);
-            unset($query);
+            $entries = $wpdb->get_results( $query, OBJECT_K );
+            unset( $query );
 
 			if ( ! FrmAppHelper::prevent_caching() ) {
 				wp_cache_set( $cache_key, $entries, 'frm_entry', 300 );
@@ -380,16 +380,16 @@ 
         }
 
         if ( ! $meta || ! $entries ) {
-            return stripslashes_deep($entries);
+            return stripslashes_deep( $entries );
         }
-        unset($meta);
+        unset( $meta );
 
-        if ( ! is_array( $where ) && preg_match('/^it\.form_id=\d+$/', $where) ) {
+        if ( ! is_array( $where ) && preg_match( '/^it\.form_id=\d+$/', $where ) ) {
 			$where = array( 'it.form_id' => substr( $where, 11 ) );
         }
 
         $meta_where = array( 'field_id !' => 0 );
-        if ( $limit == '' && is_array($where) && count($where) == 1 && isset($where['it.form_id']) ) {
+        if ( $limit == '' && is_array( $where ) && count( $where ) == 1 && isset( $where['it.form_id'] ) ) {
             $meta_where['fi.form_id'] = $where['it.form_id'];
         } else {
             $meta_where['item_id'] = array_keys( $entries );
@@ -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,11 +554,11 @@ 
 			'user_id' => self::get_entry_user_id( $values ),
 		);
 
-		if ( is_array($new_values['name']) ) {
-			$new_values['name'] = reset($new_values['name']);
+		if ( is_array( $new_values['name'] ) ) {
+			$new_values['name'] = reset( $new_values['name'] );
 		}
 
-		$new_values['updated_by'] = isset($values['updated_by']) ? $values['updated_by'] : $new_values['user_id'];
+		$new_values['updated_by'] = isset( $values['updated_by'] ) ? $values['updated_by'] : $new_values['user_id'];
 
 		return $new_values;
 	}
@@ -571,7 +571,7 @@ 
 	* @return int
 	*/
 	private static function get_is_draft_value( $values ) {
-		return ( ( isset( $values['frm_saving_draft'] ) && $values['frm_saving_draft'] == 1 ) ||  ( isset( $values['is_draft'] ) && $values['is_draft'] == 1 ) ) ? 1 : 0;
+		return ( ( isset( $values['frm_saving_draft'] ) && $values['frm_saving_draft'] == 1 ) || ( isset( $values['is_draft'] ) && $values['is_draft'] == 1 ) ) ? 1 : 0;
 	}
 
 	/**
@@ -593,7 +593,7 @@ 
 	* @return int
 	*/
 	private static function get_post_id( $values ) {
-		return isset( $values['post_id'] ) ? (int) $values['post_id']: 0;
+		return isset( $values['post_id'] ) ? (int) $values['post_id'] : 0;
 	}
 
 	/**
@@ -604,7 +604,7 @@ 
 	* @return int
 	*/
 	private static function get_parent_item_id( $values ) {
-		return isset( $values['parent_item_id'] ) ? (int) $values['parent_item_id']: 0;
+		return isset( $values['parent_item_id'] ) ? (int) $values['parent_item_id'] : 0;
 	}
 
 	/**
@@ -615,7 +615,7 @@ 
 	* @return string
 	*/
 	private static function get_created_at( $values ) {
-		return isset( $values['created_at'] ) ? $values['created_at']: current_time('mysql', 1);
+		return isset( $values['created_at'] ) ? $values['created_at'] : current_time( 'mysql', 1 );
 	}
 
 	/**
@@ -703,7 +703,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();
 		}
 
@@ -718,7 +718,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'] );
 		}
 	}
@@ -735,7 +735,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' ) );
 	}
 
 	/**
@@ -776,7 +776,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;
@@ -797,27 +797,27 @@ 
 			'name'      => self::get_new_entry_name( $values ),
 			'form_id'   => self::get_form_id( $values ),
 			'is_draft'  => self::get_is_draft_value( $values ),
-			'updated_at' => current_time('mysql', 1),
-			'updated_by' => isset($values['updated_by']) ? $values['updated_by'] : get_current_user_id(),
+			'updated_at' => current_time( 'mysql', 1 ),
+			'updated_by' => isset( $values['updated_by'] ) ? $values['updated_by'] : get_current_user_id(),
 		);
 
-		if ( isset($values['post_id']) ) {
+		if ( isset( $values['post_id'] ) ) {
 			$new_values['post_id'] = (int) $values['post_id'];
 		}
 
-		if ( isset($values['item_key']) ) {
+		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/controllers/FrmAddonsController.php

Spacing +6 added lines, -6 removed lines

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

classes/controllers/FrmXMLController.php

Indentation +181 added lines, -181 removed lines

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

Spacing +32 added lines, -32 removed lines

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

classes/controllers/FrmAppController.php

Spacing +3 added lines, -3 removed lines

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

Indentation +134 added lines, -134 removed lines

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

classes/controllers/FrmFormActionsController.php

Spacing +35 added lines, -35 removed lines

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

Indentation +216 added lines, -216 removed lines

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

formidable.php

Indentation +19 added lines, -19 removed lines

@@ -23,41 +23,41 @@
 
 global $frm_vars;
 $frm_vars = array(
-    'load_css' => false, 'forms_loaded' => array(),
-    'created_entries'   => array(),
-    'pro_is_authorized' => false,
+	'load_css' => false, 'forms_loaded' => array(),
+	'created_entries'   => array(),
+	'pro_is_authorized' => false,
 );
 
 function frm_forms_autoloader( $class_name ) {
-    // Only load Frm classes here
+	// Only load Frm classes here
 	if ( ! preg_match( '/^Frm.+$/', $class_name ) ) {
-        return;
-    }
+		return;
+	}
 
-    $filepath = dirname(__FILE__);
+	$filepath = dirname(__FILE__);
 	if ( preg_match( '/^FrmPro.+$/', $class_name ) || 'FrmUpdatesController' == $class_name ) {
-        $filepath .= '/pro';
-    }
-    $filepath .= '/classes';
+		$filepath .= '/pro';
+	}
+	$filepath .= '/classes';
 
 	if ( preg_match( '/^.+Helper$/', $class_name ) ) {
-        $filepath .= '/helpers/';
+		$filepath .= '/helpers/';
 	} else if ( preg_match( '/^.+Controller$/', $class_name ) ) {
-        $filepath .= '/controllers/';
-    } else {
-        $filepath .= '/models/';
-    }
+		$filepath .= '/controllers/';
+	} else {
+		$filepath .= '/models/';
+	}
 
 	$filepath .= $class_name . '.php';
 
-    if ( file_exists($filepath) ) {
-        include($filepath);
-    }
+	if ( file_exists($filepath) ) {
+		include($filepath);
+	}
 }
 
 // if __autoload is active, put it on the spl_autoload stack
 if ( is_array(spl_autoload_functions()) && in_array( '__autoload', spl_autoload_functions()) ) {
-    spl_autoload_register('__autoload');
+	spl_autoload_register('__autoload');
 }
 
 // Add the autoloader

Spacing +9 added lines, -9 removed lines

@@ -34,7 +34,7 @@ 
         return;
     }
 
-    $filepath = dirname(__FILE__);
+    $filepath = dirname( __FILE__ );
 	if ( preg_match( '/^FrmPro.+$/', $class_name ) || 'FrmUpdatesController' == $class_name ) {
         $filepath .= '/pro';
     }
@@ -50,25 +50,25 @@ 
 
 	$filepath .= $class_name . '.php';
 
-    if ( file_exists($filepath) ) {
-        include($filepath);
+    if ( file_exists( $filepath ) ) {
+        include( $filepath );
     }
 }
 
 // if __autoload is active, put it on the spl_autoload stack
-if ( is_array(spl_autoload_functions()) && in_array( '__autoload', spl_autoload_functions()) ) {
-    spl_autoload_register('__autoload');
+if ( is_array( spl_autoload_functions() ) && in_array( '__autoload', spl_autoload_functions() ) ) {
+    spl_autoload_register( '__autoload' );
 }
 
 // Add the autoloader
-spl_autoload_register('frm_forms_autoloader');
+spl_autoload_register( 'frm_forms_autoloader' );
 
-$frm_path = dirname(__FILE__);
-if ( file_exists($frm_path . '/pro/formidable-pro.php') ) {
+$frm_path = dirname( __FILE__ );
+if ( file_exists( $frm_path . '/pro/formidable-pro.php' ) ) {
 	include( $frm_path . '/pro/formidable-pro.php' );
 }
 
 FrmHooksController::trigger_load_hook();
 
 include_once( $frm_path . '/deprecated.php' );
-unset($frm_path);
+unset( $frm_path );

classes/views/frm-fields/radio.php

Indentation +8 added lines, -8 removed lines

@@ -1,22 +1,22 @@
 <?php
 if ( ! is_array($field['options']) ) {
-    return;
+	return;
 }
 
 foreach ( $field['options'] as $opt_key => $opt ) {
-    $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-    $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
+	$field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
+	$opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
 
-    // Get string for Other text field, if needed
+	// Get string for Other text field, if needed
 	$other_val = FrmFieldsHelper::get_other_val( compact( 'opt_key', 'field' ) );
 
-    $checked = ( $other_val || isset($field['value']) &&  (( ! is_array($field['value']) && $field['value'] == $field_val ) || (is_array($field['value']) && in_array($field_val, $field['value']) ) ) ) ? ' checked="checked"':'';
+	$checked = ( $other_val || isset($field['value']) &&  (( ! is_array($field['value']) && $field['value'] == $field_val ) || (is_array($field['value']) && in_array($field_val, $field['value']) ) ) ) ? ' checked="checked"':'';
 
 	if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) {
 		include( FrmAppHelper::plugin_path() . '/pro/classes/views/frmpro-fields/other-option.php' );
-    } else {
+	} else {
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/single-option.php' );
-    }
+	}
 
-    unset($checked, $other_val);
+	unset($checked, $other_val);
 }

Spacing +5 added lines, -5 removed lines

@@ -1,16 +1,16 @@ 
 <?php
-if ( ! is_array($field['options']) ) {
+if ( ! is_array( $field['options'] ) ) {
     return;
 }
 
 foreach ( $field['options'] as $opt_key => $opt ) {
-    $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-    $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
+    $field_val = apply_filters( 'frm_field_value_saved', $opt, $opt_key, $field );
+    $opt = apply_filters( 'frm_field_label_seen', $opt, $opt_key, $field );
 
     // Get string for Other text field, if needed
 	$other_val = FrmFieldsHelper::get_other_val( compact( 'opt_key', 'field' ) );
 
-    $checked = ( $other_val || isset($field['value']) &&  (( ! is_array($field['value']) && $field['value'] == $field_val ) || (is_array($field['value']) && in_array($field_val, $field['value']) ) ) ) ? ' checked="checked"':'';
+    $checked = ( $other_val || isset( $field['value'] ) && ( ( ! is_array( $field['value'] ) && $field['value'] == $field_val ) || ( is_array( $field['value'] ) && in_array( $field_val, $field['value'] ) ) ) ) ? ' checked="checked"' : '';
 
 	if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) {
 		include( FrmAppHelper::plugin_path() . '/pro/classes/views/frmpro-fields/other-option.php' );
@@ -18,5 +18,5 @@ 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/single-option.php' );
     }
 
-    unset($checked, $other_val);
+    unset( $checked, $other_val );
 }

classes/views/frm-fields/show-build.php

Indentation +14 added lines, -14 removed lines

@@ -3,38 +3,38 @@ 
 <?php } else if ( $field['type'] == 'textarea' ) { ?>
     <textarea name="<?php echo esc_attr( $field_name ) ?>" <?php
 		echo ( FrmField::is_option_true( $field, 'size' ) ) ? esc_attr( 'style="width:'. $field['size'] . ( is_numeric( $field['size'] ) ? 'px' : '') . ';"' ) : '';
-    ?> rows="<?php echo esc_attr( $field['max'] ); ?>" id="<?php echo esc_attr( $html_id ) ?>" class="dyn_default_value"><?php echo FrmAppHelper::esc_textarea(force_balance_tags($field['default_value'])); ?></textarea>
+	?> rows="<?php echo esc_attr( $field['max'] ); ?>" id="<?php echo esc_attr( $html_id ) ?>" class="dyn_default_value"><?php echo FrmAppHelper::esc_textarea(force_balance_tags($field['default_value'])); ?></textarea>
 
 <?php
 
 } else if ( $field['type'] == 'radio' || $field['type'] == 'checkbox' ) {
-    $field['default_value'] = maybe_unserialize($field['default_value']);
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+	$field['default_value'] = maybe_unserialize($field['default_value']);
+	if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
 		do_action( 'frm_after_checkbox', array( 'field' => $field, 'field_name' => $field_name, 'type' => $field['type'] ) );
-    } else {
-        do_action('frm_add_multiple_opts_labels', $field); ?>
+	} else {
+		do_action('frm_add_multiple_opts_labels', $field); ?>
         <ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts frm_clear<?php echo (count($field['options']) > 10) ? ' frm_field_opts_list' : ''; ?>">
 			<?php include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/radio.php' ); ?>
         </ul>
     <?php
-    }
+	}
 } else if ( $field['type'] == 'select' ) {
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+	if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
 		echo FrmFieldsHelper::dropdown_categories( array( 'name' => $field_name, 'field' => $field ) );
-    } else { ?>
+	} else { ?>
 	<select name="<?php echo esc_attr( $field_name ) . ( FrmField::is_option_true( $field, 'multiple' ) ? '[]' : '' ); ?>" <?php
 		echo FrmField::is_option_true( $field, 'size' ) ? 'class="auto_width"' : '';
 		echo FrmField::is_option_true( $field, 'multiple' ) ? ' multiple="multiple"' : ''; ?> >
 		<?php foreach ( $field['options'] as $opt_key => $opt ) {
-            $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-            $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
+			$field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
+			$opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
 			$selected = ( $field['default_value'] == $field_val || FrmFieldsHelper::get_other_val( array( 'opt_key', 'field' ) ) ) ? ' selected="selected"' : ''; ?>
             <option value="<?php echo esc_attr( $field_val ) ?>"<?php echo $selected ?>><?php echo esc_html( $opt ) ?> </option>
         <?php } ?>
     </select>
 <?php }
 
-    if ( $display['default_blank'] ) { ?>
+	if ( $display['default_blank'] ) { ?>
         <span id="frm_clear_on_focus_<?php echo esc_attr( $field['id'] ) ?>" class="frm_clear_on_focus frm-show-click">
 		<?php FrmFieldsHelper::show_default_blank_js( $field['default_blank'] ); ?>
         </span>
@@ -50,18 +50,18 @@ 
         <?php FrmFieldsHelper::show_single_option($field); ?>
         </ul>
 <?php
-    } ?>
+	} ?>
     </div>
 <?php
 } else if ( $field['type'] == 'captcha' ) {
 	if ( empty($frm_settings->pubkey) ) { ?>
     <div class="howto frm_no_captcha_text"><?php printf(__( 'Your captcha will not appear on your form until you %1$sset up%2$s the Site and Private Keys', 'formidable' ), '<a href="?page=formidable-settings">', '</a>') ?></div>
     <?php
-    } ?>
+	} ?>
 	<img src="<?php echo esc_url( FrmAppHelper::plugin_url() . '/images/recaptcha.png' ) ?>" class="recaptcha_placeholder" alt="reCaptcha"/>
     <input type="hidden" name="<?php echo esc_attr( $field_name ) ?>" value="1" />
 <?php
 } else {
-    do_action( 'frm_display_added_fields', $field );
+	do_action( 'frm_display_added_fields', $field );
 	do_action( 'frm_display_added_' . $field['type'] . '_field', $field );
 }

Spacing +14 added lines, -14 removed lines

@@ -1,33 +1,33 @@ 
 <?php if ( in_array( $display['type'], array( 'text', 'website', 'email', 'url' ) ) ) { ?>
-	<input type="text" name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id ) ?>" value="<?php echo esc_attr( $field['default_value'] ); ?>" <?php echo ( FrmField::is_option_true( $field, 'size' ) ) ? esc_attr( 'style="width:' . $field['size'] . ( is_numeric( $field['size'] ) ? 'px' : '') . ';"' ) : ''; ?> class="dyn_default_value" />
+	<input type="text" name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id ) ?>" value="<?php echo esc_attr( $field['default_value'] ); ?>" <?php echo ( FrmField::is_option_true( $field, 'size' ) ) ? esc_attr( 'style="width:' . $field['size'] . ( is_numeric( $field['size'] ) ? 'px' : '' ) . ';"' ) : ''; ?> class="dyn_default_value" />
 <?php } else if ( $field['type'] == 'textarea' ) { ?>
     <textarea name="<?php echo esc_attr( $field_name ) ?>" <?php
 		echo ( FrmField::is_option_true( $field, 'size' ) ) ? esc_attr( 'style="width:' . $field['size'] . ( is_numeric( $field['size'] ) ? 'px' : '' ) . ';"' ) : '';
-    ?> rows="<?php echo esc_attr( $field['max'] ); ?>" id="<?php echo esc_attr( $html_id ) ?>" class="dyn_default_value"><?php echo FrmAppHelper::esc_textarea(force_balance_tags($field['default_value'])); ?></textarea>
+    ?> rows="<?php echo esc_attr( $field['max'] ); ?>" id="<?php echo esc_attr( $html_id ) ?>" class="dyn_default_value"><?php echo FrmAppHelper::esc_textarea( force_balance_tags( $field['default_value'] ) ); ?></textarea>
 
 <?php
 
 } else if ( $field['type'] == 'radio' || $field['type'] == 'checkbox' ) {
-    $field['default_value'] = maybe_unserialize($field['default_value']);
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+    $field['default_value'] = maybe_unserialize( $field['default_value'] );
+    if ( isset( $field['post_field'] ) && $field['post_field'] == 'post_category' ) {
 		do_action( 'frm_after_checkbox', array( 'field' => $field, 'field_name' => $field_name, 'type' => $field['type'] ) );
     } else {
-        do_action('frm_add_multiple_opts_labels', $field); ?>
-        <ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts frm_clear<?php echo (count($field['options']) > 10) ? ' frm_field_opts_list' : ''; ?>">
+        do_action( 'frm_add_multiple_opts_labels', $field ); ?>
+        <ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts frm_clear<?php echo ( count( $field['options'] ) > 10 ) ? ' frm_field_opts_list' : ''; ?>">
 			<?php include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/radio.php' ); ?>
         </ul>
     <?php
     }
 } else if ( $field['type'] == 'select' ) {
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+    if ( isset( $field['post_field'] ) && $field['post_field'] == 'post_category' ) {
 		echo FrmFieldsHelper::dropdown_categories( array( 'name' => $field_name, 'field' => $field ) );
     } else { ?>
 	<select name="<?php echo esc_attr( $field_name ) . ( FrmField::is_option_true( $field, 'multiple' ) ? '[]' : '' ); ?>" <?php
 		echo FrmField::is_option_true( $field, 'size' ) ? 'class="auto_width"' : '';
 		echo FrmField::is_option_true( $field, 'multiple' ) ? ' multiple="multiple"' : ''; ?> >
 		<?php foreach ( $field['options'] as $opt_key => $opt ) {
-            $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-            $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
+            $field_val = apply_filters( 'frm_field_value_saved', $opt, $opt_key, $field );
+            $opt = apply_filters( 'frm_field_label_seen', $opt, $opt_key, $field );
 			$selected = ( $field['default_value'] == $field_val || FrmFieldsHelper::get_other_val( array( 'opt_key', 'field' ) ) ) ? ' selected="selected"' : ''; ?>
             <option value="<?php echo esc_attr( $field_val ) ?>"<?php echo $selected ?>><?php echo esc_html( $opt ) ?> </option>
         <?php } ?>
@@ -45,17 +45,17 @@ 
     <?php
 
 	if ( ! isset( $field['post_field'] ) || ! in_array( $field['post_field'], array( 'post_category' ) ) ) { ?>
-        <?php do_action('frm_add_multiple_opts_labels', $field); ?>
-        <ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts<?php echo ( count($field['options']) > 10 ) ? ' frm_field_opts_list' : ''; ?>">
-        <?php FrmFieldsHelper::show_single_option($field); ?>
+        <?php do_action( 'frm_add_multiple_opts_labels', $field ); ?>
+        <ul id="frm_field_<?php echo esc_attr( $field['id'] ) ?>_opts" class="frm_sortable_field_opts<?php echo ( count( $field['options'] ) > 10 ) ? ' frm_field_opts_list' : ''; ?>">
+        <?php FrmFieldsHelper::show_single_option( $field ); ?>
         </ul>
 <?php
     } ?>
     </div>
 <?php
 } else if ( $field['type'] == 'captcha' ) {
-	if ( empty($frm_settings->pubkey) ) { ?>
-    <div class="howto frm_no_captcha_text"><?php printf(__( 'Your captcha will not appear on your form until you %1$sset up%2$s the Site and Secret Keys', 'formidable' ), '<a href="?page=formidable-settings">', '</a>') ?></div>
+	if ( empty( $frm_settings->pubkey ) ) { ?>
+    <div class="howto frm_no_captcha_text"><?php printf( __( 'Your captcha will not appear on your form until you %1$sset up%2$s the Site and Secret Keys', 'formidable' ), '<a href="?page=formidable-settings">', '</a>' ) ?></div>
     <?php
     } ?>
 	<img src="<?php echo esc_url( FrmAppHelper::plugin_url() . '/images/recaptcha.png' ) ?>" class="recaptcha_placeholder" alt="reCaptcha"/>

classes/views/frm-fields/import_choices.php

Indentation +17 added lines, -17 removed lines

@@ -4,18 +4,18 @@ 
     <meta charset="<?php bloginfo( 'charset' ); ?>" />
     <title><?php bloginfo('name'); ?></title>
     <?php
-    wp_admin_css( 'global' );
-    wp_admin_css();
-    wp_admin_css( 'colors' );
-    wp_admin_css( 'ie' );
+	wp_admin_css( 'global' );
+	wp_admin_css();
+	wp_admin_css( 'colors' );
+	wp_admin_css( 'ie' );
 	if ( is_multisite() ) {
-    	wp_admin_css( 'ms' );
+		wp_admin_css( 'ms' );
 	}
 
-    do_action('admin_print_styles');
-    do_action('admin_print_scripts');
+	do_action('admin_print_styles');
+	do_action('admin_print_scripts');
 
-    ?>
+	?>
 </head>
 <body class="wp-admin no-js wp-core-ui frm_field_opts_popup <?php echo esc_attr( apply_filters( 'admin_body_class', '' ) . ' ' . $admin_body_class ); ?>">
 <div class="frm_med_padding">
@@ -29,21 +29,21 @@ 
 <?php
 $other_array = array();
 foreach ( $field->options as $fkey => $fopt ) {
-    //If it is an other option, don't include it
-    if ( $fkey && strpos( $fkey, 'other') !== false ) {
-        continue;
-    }
+	//If it is an other option, don't include it
+	if ( $fkey && strpos( $fkey, 'other') !== false ) {
+		continue;
+	}
 	if ( is_array( $fopt ) ) {
-        $label = (isset($fopt['label'])) ? $fopt['label'] : reset($fopt);
-        $value = (isset($fopt['value'])) ? $fopt['value'] : $label;
+		$label = (isset($fopt['label'])) ? $fopt['label'] : reset($fopt);
+		$value = (isset($fopt['value'])) ? $fopt['value'] : $label;
 		if ( $label != $value && FrmField::is_option_true( $field, 'separate_value' ) ) {
-            echo "$label|$value\n";
+			echo "$label|$value\n";
 		} else {
 			echo $label . "\n";
-        }
+		}
 	} else {
 		echo $fopt . "\n";
-    }
+	}
 } ?>
 </textarea>
 

Spacing +7 added lines, -7 removed lines

@@ -2,7 +2,7 @@ 
 <html <?php language_attributes(); ?>>
 <head>
     <meta charset="<?php bloginfo( 'charset' ); ?>" />
-    <title><?php bloginfo('name'); ?></title>
+    <title><?php bloginfo( 'name' ); ?></title>
     <?php
     wp_admin_css( 'global' );
     wp_admin_css();
@@ -12,8 +12,8 @@ 
     	wp_admin_css( 'ms' );
 	}
 
-    do_action('admin_print_styles');
-    do_action('admin_print_scripts');
+    do_action( 'admin_print_styles' );
+    do_action( 'admin_print_scripts' );
 
     ?>
 </head>
@@ -22,7 +22,7 @@ 
 <p class="howto"><?php _e( 'Edit or add field options (one per line)', 'formidable' ) ?></p>
 <ul class="frm_prepop">
 	<?php foreach ( $prepop as $label => $pop ) { ?>
-    <li><a href="javascript:void(0)" onclick='frmPrePop(<?php echo str_replace("'", '&#145;', json_encode($pop)) ?>); return false;'><?php echo esc_html( $label ) ?></a></li>
+    <li><a href="javascript:void(0)" onclick='frmPrePop(<?php echo str_replace( "'", '&#145;', json_encode( $pop ) ) ?>); return false;'><?php echo esc_html( $label ) ?></a></li>
     <?php } ?>
 </ul>
 <textarea name="frm_bulk_options" id="frm_bulk_options">
@@ -30,12 +30,12 @@ 
 $other_array = array();
 foreach ( $field->options as $fkey => $fopt ) {
     //If it is an other option, don't include it
-    if ( $fkey && strpos( $fkey, 'other') !== false ) {
+    if ( $fkey && strpos( $fkey, 'other' ) !== false ) {
         continue;
     }
 	if ( is_array( $fopt ) ) {
-        $label = (isset($fopt['label'])) ? $fopt['label'] : reset($fopt);
-        $value = (isset($fopt['value'])) ? $fopt['value'] : $label;
+        $label = ( isset( $fopt['label'] ) ) ? $fopt['label'] : reset( $fopt );
+        $value = ( isset( $fopt['value'] ) ) ? $fopt['value'] : $label;
 		if ( $label != $value && FrmField::is_option_true( $field, 'separate_value' ) ) {
             echo "$label|$value\n";
 		} else {