Inspection of "Work on file upload editing bug" - Strategy11/formidable-forms - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 50511d...30b7fb )

by Jamie

created 2015-12-19 01:18 UTC

Status

Indentation +203 added lines, -203 removed lines patch added patch discarded remove patch

@@ -5,27 +5,27 @@  discard block
 block discarded – undo
 
 class FrmEntryMeta {
 
-    /**
-     * @param string $meta_key
-     */
+	/**
+	 * @param string $meta_key
+	 */
 	public static function add_entry_meta( $entry_id, $field_id, $meta_key = null, $meta_value ) {
-        global $wpdb;
+		global $wpdb;
 
-        if ( FrmAppHelper::is_empty_value( $meta_value ) ) {
-            // don't save blank fields
-            return;
-        }
+		if ( FrmAppHelper::is_empty_value( $meta_value ) ) {
+			// don't save blank fields
+			return;
+		}
 
-        $new_values = array(
+		$new_values = array(
 			'meta_value'    => is_array( $meta_value ) ? serialize( array_filter( $meta_value, 'FrmAppHelper::is_not_empty_value' ) ) : trim( $meta_value ),
-            'item_id'       => $entry_id,
-            'field_id'      => $field_id,
-            'created_at'    => current_time('mysql', 1),
-        );
+			'item_id'       => $entry_id,
+			'field_id'      => $field_id,
+			'created_at'    => current_time('mysql', 1),
+		);
 
-        $new_values = apply_filters('frm_add_entry_meta', $new_values);
+		$new_values = apply_filters('frm_add_entry_meta', $new_values);
 
-        $query_results = $wpdb->insert( $wpdb->prefix .'frm_item_metas', $new_values );
+		$query_results = $wpdb->insert( $wpdb->prefix .'frm_item_metas', $new_values );
 
 		if ( $query_results ) {
 			self::clear_cache();
@@ -34,40 +34,40 @@  discard block
 block discarded – undo
 			$id = 0;
 		}
 
-        return $id;
-    }
+		return $id;
+	}
 
-    /**
-     * @param string $meta_key
-     */
+	/**
+	 * @param string $meta_key
+	 */
 	public static function update_entry_meta( $entry_id, $field_id, $meta_key = null, $meta_value ) {
-        if ( ! $field_id ) {
-            return false;
-        }
+		if ( ! $field_id ) {
+			return false;
+		}
 
-        global $wpdb;
+		global $wpdb;
 
-        $values = $where_values = array( 'item_id' => $entry_id, 'field_id' => $field_id );
-        $values['meta_value'] = $meta_value;
-        $values = apply_filters('frm_update_entry_meta', $values);
+		$values = $where_values = array( 'item_id' => $entry_id, 'field_id' => $field_id );
+		$values['meta_value'] = $meta_value;
+		$values = apply_filters('frm_update_entry_meta', $values);
 		if ( is_array($values['meta_value']) ) {
 			$values['meta_value'] = array_filter( $values['meta_value'], 'FrmAppHelper::is_not_empty_value' );
 		}
-        $meta_value = maybe_serialize($values['meta_value']);
+		$meta_value = maybe_serialize($values['meta_value']);
 
-        wp_cache_delete( $entry_id, 'frm_entry');
+		wp_cache_delete( $entry_id, 'frm_entry');
 		self::clear_cache();
 
-        return $wpdb->update( $wpdb->prefix .'frm_item_metas', array( 'meta_value' => $meta_value ), $where_values );
-    }
+		return $wpdb->update( $wpdb->prefix .'frm_item_metas', array( 'meta_value' => $meta_value ), $where_values );
+	}
 
 	public static function update_entry_metas( $entry_id, $values ) {
-        global $wpdb;
+		global $wpdb;
 
 		$prev_values = FrmDb::get_col( $wpdb->prefix .'frm_item_metas', array( 'item_id' => $entry_id, 'field_id !' => 0 ), 'field_id' );
 
-        foreach ( $values as $field_id => $meta_value ) {
-            // set the value for the file upload field and add new tags (in Pro version)
+		foreach ( $values as $field_id => $meta_value ) {
+			// set the value for the file upload field and add new tags (in Pro version)
 			$meta_value = apply_filters( 'frm_prepare_data_before_db', $meta_value, $field_id, $entry_id );
 
 			if ( $prev_values && in_array($field_id, $prev_values) ) {
@@ -85,39 +85,39 @@  discard block
 block discarded – undo
 			}
 		}
 
-        if ( empty($prev_values) ) {
-            return;
-        }
+		if ( empty($prev_values) ) {
+			return;
+		}
 
-        $prev_values = array_diff($prev_values, array_keys($values));
+		$prev_values = array_diff($prev_values, array_keys($values));
 
-        if ( empty($prev_values) ) {
-            return;
-        }
+		if ( empty($prev_values) ) {
+			return;
+		}
 
 		// prepare the query
 		$where = array( 'item_id' => $entry_id, 'field_id' => $prev_values );
 		FrmDb::get_where_clause_and_values( $where );
 
-        // Delete any leftovers
-        $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_item_metas ' . $where['where'], $where['values'] ) );
+		// Delete any leftovers
+		$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_item_metas ' . $where['where'], $where['values'] ) );
 		self::clear_cache();
-    }
+	}
 
 	public static function duplicate_entry_metas( $old_id, $new_id ) {
-        $metas = self::get_entry_meta_info($old_id);
-        foreach ( $metas as $meta ) {
-            self::add_entry_meta($new_id, $meta->field_id, null, $meta->meta_value);
-            unset($meta);
-        }
+		$metas = self::get_entry_meta_info($old_id);
+		foreach ( $metas as $meta ) {
+			self::add_entry_meta($new_id, $meta->field_id, null, $meta->meta_value);
+			unset($meta);
+		}
 		self::clear_cache();
-    }
+	}
 
 	public static function delete_entry_meta( $entry_id, $field_id ) {
-        global $wpdb;
+		global $wpdb;
 		self::clear_cache();
-        return $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->prefix}frm_item_metas WHERE field_id=%d AND item_id=%d", $field_id, $entry_id));
-    }
+		return $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->prefix}frm_item_metas WHERE field_id=%d AND item_id=%d", $field_id, $entry_id));
+	}
 
 	/**
 	 * Clear entry meta caching
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
 	}
 
 	public static function get_entry_meta_by_field( $entry_id, $field_id ) {
-        global $wpdb;
+		global $wpdb;
 
 		if ( is_object( $entry_id ) ) {
 			$entry = $entry_id;
@@ -155,24 +155,24 @@  discard block
 block discarded – undo
 
 		if ( $cached && isset( $cached->metas ) && isset( $cached->metas[ $field_id ] ) ) {
 			$result = $cached->metas[ $field_id ];
-            return stripslashes_deep($result);
-        }
+			return stripslashes_deep($result);
+		}
 
 		$get_table = $wpdb->prefix .'frm_item_metas';
 		$query = array( 'item_id' => $entry_id );
-        if ( is_numeric($field_id) ) {
+		if ( is_numeric($field_id) ) {
 			$query['field_id'] = $field_id;
-        } else {
+		} else {
 			$get_table .= ' it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id';
 			$query['fi.field_key'] = $field_id;
-        }
+		}
 
 		$result = FrmDb::get_var( $get_table, $query, 'meta_value' );
-        $result = maybe_unserialize($result);
-        $result = stripslashes_deep($result);
+		$result = maybe_unserialize($result);
+		$result = stripslashes_deep($result);
 
-        return $result;
-    }
+		return $result;
+	}
 
 	public static function get_entry_meta( $entry_id, $field_id ) {
 		_deprecated_function( __FUNCTION__, '2.0', 'FrmEntryMeta::get_entry_meta_by_field' );
@@ -180,117 +180,117 @@  discard block
 block discarded – undo
 	}
 
 	public static function get_entry_metas( $entry_id ) {
-        _deprecated_function( __FUNCTION__, '1.07.10');
+		_deprecated_function( __FUNCTION__, '1.07.10');
 
-        global $wpdb;
+		global $wpdb;
 		return FrmDb::get_col( $wpdb->prefix . 'frm_item_metas', array( 'item_id' => $entry_id ), 'meta_value' );
-    }
+	}
 
-    public static function get_entry_metas_for_field( $field_id, $order = '', $limit = '', $args = array() ) {
+	public static function get_entry_metas_for_field( $field_id, $order = '', $limit = '', $args = array() ) {
 		$defaults = array( 'value' => false, 'unique' => false, 'stripslashes' => true, 'is_draft' => false );
-        $args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args( $args, $defaults );
 
-        $query = array();
-        self::meta_field_query($field_id, $order, $limit, $args, $query);
-        $query = implode(' ', $query);
+		$query = array();
+		self::meta_field_query($field_id, $order, $limit, $args, $query);
+		$query = implode(' ', $query);
 
-        $cache_key = 'entry_metas_for_field_'. $field_id . $order . $limit . maybe_serialize($args);
-        $values = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, 'get_col');
+		$cache_key = 'entry_metas_for_field_'. $field_id . $order . $limit . maybe_serialize($args);
+		$values = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, 'get_col');
 
-        if ( ! $args['stripslashes'] ) {
-            return $values;
-        }
+		if ( ! $args['stripslashes'] ) {
+			return $values;
+		}
 
 		foreach ( $values as $k => $v ) {
 			$values[ $k ] = maybe_unserialize( $v );
-            unset($k, $v);
-        }
+			unset($k, $v);
+		}
 
-        return stripslashes_deep($values);
-    }
+		return stripslashes_deep($values);
+	}
 
-    /**
-     * @param string $order
-     * @param string $limit
-     */
+	/**
+	 * @param string $order
+	 * @param string $limit
+	 */
 	private static function meta_field_query( $field_id, $order, $limit, $args, array &$query ) {
-        global $wpdb;
-        $query[] = 'SELECT';
-        $query[] = $args['unique'] ? 'DISTINCT(em.meta_value)' : 'em.meta_value';
-        $query[] = 'FROM '. $wpdb->prefix .'frm_item_metas em ';
-
-        if ( ! $args['is_draft'] ) {
-            $query[] = 'INNER JOIN '. $wpdb->prefix .'frm_items e ON (e.id=em.item_id)';
-        }
-
-        if ( is_numeric($field_id) ) {
-            $query[] = $wpdb->prepare('WHERE em.field_id=%d', $field_id);
-        } else {
-            $query[] = $wpdb->prepare('LEFT JOIN '. $wpdb->prefix .'frm_fields fi ON (em.field_id = fi.id) WHERE fi.field_key=%s', $field_id);
-        }
-
-        if ( ! $args['is_draft'] ) {
-            $query[] = 'AND e.is_draft=0';
-        }
-
-        if ( $args['value'] ) {
-            $query[] = $wpdb->prepare(' AND meta_value=%s', $args['value']);
-        }
-        $query[] = $order . $limit;
-    }
+		global $wpdb;
+		$query[] = 'SELECT';
+		$query[] = $args['unique'] ? 'DISTINCT(em.meta_value)' : 'em.meta_value';
+		$query[] = 'FROM '. $wpdb->prefix .'frm_item_metas em ';
+
+		if ( ! $args['is_draft'] ) {
+			$query[] = 'INNER JOIN '. $wpdb->prefix .'frm_items e ON (e.id=em.item_id)';
+		}
+
+		if ( is_numeric($field_id) ) {
+			$query[] = $wpdb->prepare('WHERE em.field_id=%d', $field_id);
+		} else {
+			$query[] = $wpdb->prepare('LEFT JOIN '. $wpdb->prefix .'frm_fields fi ON (em.field_id = fi.id) WHERE fi.field_key=%s', $field_id);
+		}
+
+		if ( ! $args['is_draft'] ) {
+			$query[] = 'AND e.is_draft=0';
+		}
+
+		if ( $args['value'] ) {
+			$query[] = $wpdb->prepare(' AND meta_value=%s', $args['value']);
+		}
+		$query[] = $order . $limit;
+	}
 
 	public static function get_entry_meta_info( $entry_id ) {
 		return FrmDb::get_results( 'frm_item_metas', array( 'item_id' => $entry_id ) );
-    }
+	}
 
 	public static function getAll( $where = array(), $order_by = '', $limit = '', $stripslashes = false ) {
-        global $wpdb;
-        $query = 'SELECT it.*, fi.type as field_type, fi.field_key as field_key,
+		global $wpdb;
+		$query = 'SELECT it.*, fi.type as field_type, fi.field_key as field_key,
             fi.required as required, fi.form_id as field_form_id, fi.name as field_name, fi.options as fi_options
             FROM '. $wpdb->prefix .'frm_item_metas it LEFT OUTER JOIN '. $wpdb->prefix .'frm_fields fi ON it.field_id=fi.id' .
-            FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+			FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
 
-        $cache_key = 'all_'. maybe_serialize($where) . $order_by . $limit;
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_row' : 'get_results'));
+		$cache_key = 'all_'. maybe_serialize($where) . $order_by . $limit;
+		$results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_row' : 'get_results'));
 
-        if ( ! $results || ! $stripslashes ) {
-            return $results;
-        }
+		if ( ! $results || ! $stripslashes ) {
+			return $results;
+		}
 
-        foreach ( $results as $k => $result ) {
+		foreach ( $results as $k => $result ) {
 			$results[ $k ]->meta_value = stripslashes_deep( maybe_unserialize( $result->meta_value ) );
-            unset($k, $result);
-        }
+			unset($k, $result);
+		}
 
-        return $results;
-    }
+		return $results;
+	}
 
-    public static function getEntryIds( $where = array(), $order_by = '', $limit = '', $unique = true, $args = array() ) {
+	public static function getEntryIds( $where = array(), $order_by = '', $limit = '', $unique = true, $args = array() ) {
 		$defaults = array(
 			'is_draft' => false,
 			'user_id'  => '',
 			'group_by' => '',
 		);
-        $args = wp_parse_args($args, $defaults);
+		$args = wp_parse_args($args, $defaults);
 
-        $query = array();
-        self::get_ids_query($where, $order_by, $limit, $unique, $args, $query );
-        $query = implode(' ', $query);
+		$query = array();
+		self::get_ids_query($where, $order_by, $limit, $unique, $args, $query );
+		$query = implode(' ', $query);
 
-        $cache_key = 'ids_'. maybe_serialize($where) . $order_by . 'l'. $limit . 'u'. $unique . maybe_serialize($args);
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_var' : 'get_col'));
+		$cache_key = 'ids_'. maybe_serialize($where) . $order_by . 'l'. $limit . 'u'. $unique . maybe_serialize($args);
+		$results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_var' : 'get_col'));
 
-        return $results;
-    }
+		return $results;
+	}
 
-    /**
-     * @param string|array $where
-     * @param string $order_by
-     * @param string $limit
-     */
+	/**
+	 * @param string|array $where
+	 * @param string $order_by
+	 * @param string $limit
+	 */
 	private static function get_ids_query( $where, $order_by, $limit, $unique, $args, array &$query ) {
-        global $wpdb;
-        $query[] = 'SELECT';
+		global $wpdb;
+		$query[] = 'SELECT';
 
 		$defaults = array( 'return_parent_id' => false );
 		$args = array_merge( $defaults, $args );
@@ -301,91 +301,91 @@  discard block
 block discarded – undo
 			$query[] = $unique ? 'DISTINCT(it.item_id)' : 'it.item_id';
 		}
 
-        $query[] = 'FROM '. $wpdb->prefix .'frm_item_metas it LEFT OUTER JOIN '. $wpdb->prefix .'frm_fields fi ON it.field_id=fi.id';
+		$query[] = 'FROM '. $wpdb->prefix .'frm_item_metas it LEFT OUTER JOIN '. $wpdb->prefix .'frm_fields fi ON it.field_id=fi.id';
 
-        $query[] = 'INNER JOIN '. $wpdb->prefix .'frm_items e ON (e.id=it.item_id)';
-        if ( is_array($where) ) {
-            if ( ! $args['is_draft'] ) {
-                $where['e.is_draft'] = 0;
-            } else if ( $args['is_draft'] == 1 ) {
-                $where['e.is_draft'] = 1;
-            }
+		$query[] = 'INNER JOIN '. $wpdb->prefix .'frm_items e ON (e.id=it.item_id)';
+		if ( is_array($where) ) {
+			if ( ! $args['is_draft'] ) {
+				$where['e.is_draft'] = 0;
+			} else if ( $args['is_draft'] == 1 ) {
+				$where['e.is_draft'] = 1;
+			}
 
-            if ( ! empty($args['user_id']) ) {
-                $where['e.user_id'] = $args['user_id'];
-            }
-            $query[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+			if ( ! empty($args['user_id']) ) {
+				$where['e.user_id'] = $args['user_id'];
+			}
+			$query[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
 
 			if ( $args['group_by'] ) {
 				$query[] = ' GROUP BY '. sanitize_text_field( $args['group_by'] );
 			}
-            return;
-        }
+			return;
+		}
 
 		$draft_where = $user_where = '';
-        if ( ! $args['is_draft'] ) {
+		if ( ! $args['is_draft'] ) {
 			$draft_where = $wpdb->prepare( ' AND e.is_draft=%d', 0 );
-        } else if ( $args['is_draft'] == 1 ) {
+		} else if ( $args['is_draft'] == 1 ) {
 			$draft_where = $wpdb->prepare( ' AND e.is_draft=%d', 1 );
-        }
-
-        if ( ! empty($args['user_id']) ) {
-            $user_where = $wpdb->prepare(' AND e.user_id=%d', $args['user_id']);
-        }
-
-        if ( strpos($where, ' GROUP BY ') ) {
-            // don't inject WHERE filtering after GROUP BY
-            $parts = explode(' GROUP BY ', $where);
-            $where = $parts[0];
-            $where .= $draft_where . $user_where;
-            $where .= ' GROUP BY '. $parts[1];
-        } else {
-            $where .= $draft_where . $user_where;
-        }
+		}
+
+		if ( ! empty($args['user_id']) ) {
+			$user_where = $wpdb->prepare(' AND e.user_id=%d', $args['user_id']);
+		}
+
+		if ( strpos($where, ' GROUP BY ') ) {
+			// don't inject WHERE filtering after GROUP BY
+			$parts = explode(' GROUP BY ', $where);
+			$where = $parts[0];
+			$where .= $draft_where . $user_where;
+			$where .= ' GROUP BY '. $parts[1];
+		} else {
+			$where .= $draft_where . $user_where;
+		}
 
 		// The query has already been prepared
 		$query[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
-    }
+	}
 
-    public static function search_entry_metas( $search, $field_id = '', $operator ) {
-        $cache_key = 'search_'. maybe_serialize($search) . $field_id . $operator;
-        $results = wp_cache_get($cache_key, 'frm_entry');
-        if ( false !== $results ) {
-            return $results;
-        }
+	public static function search_entry_metas( $search, $field_id = '', $operator ) {
+		$cache_key = 'search_'. maybe_serialize($search) . $field_id . $operator;
+		$results = wp_cache_get($cache_key, 'frm_entry');
+		if ( false !== $results ) {
+			return $results;
+		}
 
-        global $wpdb;
+		global $wpdb;
 		if ( is_array( $search ) ) {
-            $where = '';
+			$where = '';
 			foreach ( $search as $field => $value ) {
 				if ( $value <= 0 || ! in_array( $field, array( 'year', 'month', 'day' ) ) ) {
-                    continue;
-                }
-
-                switch ( $field ) {
-                    case 'year':
-                        $value = '%'. $value;
-                    break;
-                    case 'month':
-                        $value .= '%';
-                    break;
-                    case 'day':
-                        $value = '%'. $value .'%';
-                }
-                $where .= $wpdb->prepare(' meta_value '. $operator .' %s and', $value);
-            }
-            $where .= $wpdb->prepare(' field_id=%d', $field_id);
-            $query = "SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas". FrmAppHelper::prepend_and_or_where(' WHERE ', $where);
-        } else {
+					continue;
+				}
+
+				switch ( $field ) {
+					case 'year':
+						$value = '%'. $value;
+					break;
+					case 'month':
+						$value .= '%';
+					break;
+					case 'day':
+						$value = '%'. $value .'%';
+				}
+				$where .= $wpdb->prepare(' meta_value '. $operator .' %s and', $value);
+			}
+			$where .= $wpdb->prepare(' field_id=%d', $field_id);
+			$query = "SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas". FrmAppHelper::prepend_and_or_where(' WHERE ', $where);
+		} else {
 			if ( $operator == 'LIKE' ) {
-                $search = '%' . $search . '%';
+				$search = '%' . $search . '%';
 			}
-            $query = $wpdb->prepare("SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas WHERE meta_value {$operator} %s and field_id = %d", $search, $field_id);
-        }
+			$query = $wpdb->prepare("SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas WHERE meta_value {$operator} %s and field_id = %d", $search, $field_id);
+		}
 
-        $results = $wpdb->get_col($query, 0);
-        wp_cache_set($cache_key, $results, 'frm_entry', 300);
+		$results = $wpdb->get_col($query, 0);
+		wp_cache_set($cache_key, $results, 'frm_entry', 300);
 
-        return $results;
-    }
+		return $results;
+	}
 }

Please login to merge, or discard this patch.

Spacing +74 added lines, -74 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 
@@ -20,12 +20,12 @@  discard block
 block discarded – undo
 			'meta_value'    => is_array( $meta_value ) ? serialize( array_filter( $meta_value, 'FrmAppHelper::is_not_empty_value' ) ) : trim( $meta_value ),
             'item_id'       => $entry_id,
             'field_id'      => $field_id,
-            'created_at'    => current_time('mysql', 1),
+            'created_at'    => current_time( 'mysql', 1 ),
         );
 
-        $new_values = apply_filters('frm_add_entry_meta', $new_values);
+        $new_values = apply_filters( 'frm_add_entry_meta', $new_values );
 
-        $query_results = $wpdb->insert( $wpdb->prefix .'frm_item_metas', $new_values );
+        $query_results = $wpdb->insert( $wpdb->prefix . 'frm_item_metas', $new_values );
 
 		if ( $query_results ) {
 			self::clear_cache();
@@ -49,32 +49,32 @@  discard block
 block discarded – undo
 
         $values = $where_values = array( 'item_id' => $entry_id, 'field_id' => $field_id );
         $values['meta_value'] = $meta_value;
-        $values = apply_filters('frm_update_entry_meta', $values);
-		if ( is_array($values['meta_value']) ) {
+        $values = apply_filters( 'frm_update_entry_meta', $values );
+		if ( is_array( $values['meta_value'] ) ) {
 			$values['meta_value'] = array_filter( $values['meta_value'], 'FrmAppHelper::is_not_empty_value' );
 		}
-        $meta_value = maybe_serialize($values['meta_value']);
+        $meta_value = maybe_serialize( $values['meta_value'] );
 
-        wp_cache_delete( $entry_id, 'frm_entry');
+        wp_cache_delete( $entry_id, 'frm_entry' );
 		self::clear_cache();
 
-        return $wpdb->update( $wpdb->prefix .'frm_item_metas', array( 'meta_value' => $meta_value ), $where_values );
+        return $wpdb->update( $wpdb->prefix . 'frm_item_metas', array( 'meta_value' => $meta_value ), $where_values );
     }
 
 	public static function update_entry_metas( $entry_id, $values ) {
         global $wpdb;
 
-		$prev_values = FrmDb::get_col( $wpdb->prefix .'frm_item_metas', array( 'item_id' => $entry_id, 'field_id !' => 0 ), 'field_id' );
+		$prev_values = FrmDb::get_col( $wpdb->prefix . 'frm_item_metas', array( 'item_id' => $entry_id, 'field_id !' => 0 ), 'field_id' );
 
         foreach ( $values as $field_id => $meta_value ) {
             // set the value for the file upload field and add new tags (in Pro version)
 			$meta_value = apply_filters( 'frm_prepare_data_before_db', $meta_value, $field_id, $entry_id );
 
-			if ( $prev_values && in_array($field_id, $prev_values) ) {
+			if ( $prev_values && in_array( $field_id, $prev_values ) ) {
 
 				if ( ( is_array( $meta_value ) && empty( $meta_value ) ) || ( ! is_array( $meta_value ) && trim( $meta_value ) == '' ) ) {
 					// remove blank fields
-					unset( $values[ $field_id ] );
+					unset( $values[$field_id] );
 				} else {
 					// if value exists, then update it
 					self::update_entry_meta( $entry_id, $field_id, '', $meta_value );
@@ -85,13 +85,13 @@  discard block
 block discarded – undo
 			}
 		}
 
-        if ( empty($prev_values) ) {
+        if ( empty( $prev_values ) ) {
             return;
         }
 
-        $prev_values = array_diff($prev_values, array_keys($values));
+        $prev_values = array_diff( $prev_values, array_keys( $values ) );
 
-        if ( empty($prev_values) ) {
+        if ( empty( $prev_values ) ) {
             return;
         }
 
@@ -105,10 +105,10 @@  discard block
 block discarded – undo
     }
 
 	public static function duplicate_entry_metas( $old_id, $new_id ) {
-        $metas = self::get_entry_meta_info($old_id);
+        $metas = self::get_entry_meta_info( $old_id );
         foreach ( $metas as $meta ) {
-            self::add_entry_meta($new_id, $meta->field_id, null, $meta->meta_value);
-            unset($meta);
+            self::add_entry_meta( $new_id, $meta->field_id, null, $meta->meta_value );
+            unset( $meta );
         }
 		self::clear_cache();
     }
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
 	public static function delete_entry_meta( $entry_id, $field_id ) {
         global $wpdb;
 		self::clear_cache();
-        return $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->prefix}frm_item_metas WHERE field_id=%d AND item_id=%d", $field_id, $entry_id));
+        return $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}frm_item_metas WHERE field_id=%d AND item_id=%d", $field_id, $entry_id ) );
     }
 
 	/**
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
 	 */
 	public static function get_meta_value( $entry, $field_id ) {
 		if ( isset( $entry->metas ) ) {
-			return isset( $entry->metas[ $field_id ] ) ? $entry->metas[ $field_id ] : false;
+			return isset( $entry->metas[$field_id] ) ? $entry->metas[$field_id] : false;
 		} else {
 			return self::get_entry_meta_by_field( $entry->id, $field_id );
 		}
@@ -153,14 +153,14 @@  discard block
 block discarded – undo
 			$cached = FrmAppHelper::check_cache( $entry_id, 'frm_entry' );
 		}
 
-		if ( $cached && isset( $cached->metas ) && isset( $cached->metas[ $field_id ] ) ) {
-			$result = $cached->metas[ $field_id ];
-            return stripslashes_deep($result);
+		if ( $cached && isset( $cached->metas ) && isset( $cached->metas[$field_id] ) ) {
+			$result = $cached->metas[$field_id];
+            return stripslashes_deep( $result );
         }
 
-		$get_table = $wpdb->prefix .'frm_item_metas';
+		$get_table = $wpdb->prefix . 'frm_item_metas';
 		$query = array( 'item_id' => $entry_id );
-        if ( is_numeric($field_id) ) {
+        if ( is_numeric( $field_id ) ) {
 			$query['field_id'] = $field_id;
         } else {
 			$get_table .= ' it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id';
@@ -168,8 +168,8 @@  discard block
 block discarded – undo
         }
 
 		$result = FrmDb::get_var( $get_table, $query, 'meta_value' );
-        $result = maybe_unserialize($result);
-        $result = stripslashes_deep($result);
+        $result = maybe_unserialize( $result );
+        $result = stripslashes_deep( $result );
 
         return $result;
     }
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
 	}
 
 	public static function get_entry_metas( $entry_id ) {
-        _deprecated_function( __FUNCTION__, '1.07.10');
+        _deprecated_function( __FUNCTION__, '1.07.10' );
 
         global $wpdb;
 		return FrmDb::get_col( $wpdb->prefix . 'frm_item_metas', array( 'item_id' => $entry_id ), 'meta_value' );
@@ -191,22 +191,22 @@  discard block
 block discarded – undo
         $args = wp_parse_args( $args, $defaults );
 
         $query = array();
-        self::meta_field_query($field_id, $order, $limit, $args, $query);
-        $query = implode(' ', $query);
+        self::meta_field_query( $field_id, $order, $limit, $args, $query );
+        $query = implode( ' ', $query );
 
-        $cache_key = 'entry_metas_for_field_'. $field_id . $order . $limit . maybe_serialize($args);
-        $values = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, 'get_col');
+        $cache_key = 'entry_metas_for_field_' . $field_id . $order . $limit . maybe_serialize( $args );
+        $values = FrmAppHelper::check_cache( $cache_key, 'frm_entry', $query, 'get_col' );
 
         if ( ! $args['stripslashes'] ) {
             return $values;
         }
 
 		foreach ( $values as $k => $v ) {
-			$values[ $k ] = maybe_unserialize( $v );
-            unset($k, $v);
+			$values[$k] = maybe_unserialize( $v );
+            unset( $k, $v );
         }
 
-        return stripslashes_deep($values);
+        return stripslashes_deep( $values );
     }
 
     /**
@@ -217,16 +217,16 @@  discard block
 block discarded – undo
         global $wpdb;
         $query[] = 'SELECT';
         $query[] = $args['unique'] ? 'DISTINCT(em.meta_value)' : 'em.meta_value';
-        $query[] = 'FROM '. $wpdb->prefix .'frm_item_metas em ';
+        $query[] = 'FROM ' . $wpdb->prefix . 'frm_item_metas em ';
 
         if ( ! $args['is_draft'] ) {
-            $query[] = 'INNER JOIN '. $wpdb->prefix .'frm_items e ON (e.id=em.item_id)';
+            $query[] = 'INNER JOIN ' . $wpdb->prefix . 'frm_items e ON (e.id=em.item_id)';
         }
 
-        if ( is_numeric($field_id) ) {
-            $query[] = $wpdb->prepare('WHERE em.field_id=%d', $field_id);
+        if ( is_numeric( $field_id ) ) {
+            $query[] = $wpdb->prepare( 'WHERE em.field_id=%d', $field_id );
         } else {
-            $query[] = $wpdb->prepare('LEFT JOIN '. $wpdb->prefix .'frm_fields fi ON (em.field_id = fi.id) WHERE fi.field_key=%s', $field_id);
+            $query[] = $wpdb->prepare( 'LEFT JOIN ' . $wpdb->prefix . 'frm_fields fi ON (em.field_id = fi.id) WHERE fi.field_key=%s', $field_id );
         }
 
         if ( ! $args['is_draft'] ) {
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
         }
 
         if ( $args['value'] ) {
-            $query[] = $wpdb->prepare(' AND meta_value=%s', $args['value']);
+            $query[] = $wpdb->prepare( ' AND meta_value=%s', $args['value'] );
         }
         $query[] = $order . $limit;
     }
@@ -247,19 +247,19 @@  discard block
 block discarded – undo
         global $wpdb;
         $query = 'SELECT it.*, fi.type as field_type, fi.field_key as field_key,
             fi.required as required, fi.form_id as field_form_id, fi.name as field_name, fi.options as fi_options
-            FROM '. $wpdb->prefix .'frm_item_metas it LEFT OUTER JOIN '. $wpdb->prefix .'frm_fields fi ON it.field_id=fi.id' .
-            FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+            FROM '. $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id' .
+            FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
 
-        $cache_key = 'all_'. maybe_serialize($where) . $order_by . $limit;
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_row' : 'get_results'));
+        $cache_key = 'all_' . maybe_serialize( $where ) . $order_by . $limit;
+        $results = FrmAppHelper::check_cache( $cache_key, 'frm_entry', $query, ( $limit == ' LIMIT 1' ? 'get_row' : 'get_results' ) );
 
         if ( ! $results || ! $stripslashes ) {
             return $results;
         }
 
         foreach ( $results as $k => $result ) {
-			$results[ $k ]->meta_value = stripslashes_deep( maybe_unserialize( $result->meta_value ) );
-            unset($k, $result);
+			$results[$k]->meta_value = stripslashes_deep( maybe_unserialize( $result->meta_value ) );
+            unset( $k, $result );
         }
 
         return $results;
@@ -271,14 +271,14 @@  discard block
 block discarded – undo
 			'user_id'  => '',
 			'group_by' => '',
 		);
-        $args = wp_parse_args($args, $defaults);
+        $args = wp_parse_args( $args, $defaults );
 
         $query = array();
-        self::get_ids_query($where, $order_by, $limit, $unique, $args, $query );
-        $query = implode(' ', $query);
+        self::get_ids_query( $where, $order_by, $limit, $unique, $args, $query );
+        $query = implode( ' ', $query );
 
-        $cache_key = 'ids_'. maybe_serialize($where) . $order_by . 'l'. $limit . 'u'. $unique . maybe_serialize($args);
-        $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_var' : 'get_col'));
+        $cache_key = 'ids_' . maybe_serialize( $where ) . $order_by . 'l' . $limit . 'u' . $unique . maybe_serialize( $args );
+        $results = FrmAppHelper::check_cache( $cache_key, 'frm_entry', $query, ( $limit == ' LIMIT 1' ? 'get_var' : 'get_col' ) );
 
         return $results;
     }
@@ -301,23 +301,23 @@  discard block
 block discarded – undo
 			$query[] = $unique ? 'DISTINCT(it.item_id)' : 'it.item_id';
 		}
 
-        $query[] = 'FROM '. $wpdb->prefix .'frm_item_metas it LEFT OUTER JOIN '. $wpdb->prefix .'frm_fields fi ON it.field_id=fi.id';
+        $query[] = 'FROM ' . $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id';
 
-        $query[] = 'INNER JOIN '. $wpdb->prefix .'frm_items e ON (e.id=it.item_id)';
-        if ( is_array($where) ) {
+        $query[] = 'INNER JOIN ' . $wpdb->prefix . 'frm_items e ON (e.id=it.item_id)';
+        if ( is_array( $where ) ) {
             if ( ! $args['is_draft'] ) {
                 $where['e.is_draft'] = 0;
             } else if ( $args['is_draft'] == 1 ) {
                 $where['e.is_draft'] = 1;
             }
 
-            if ( ! empty($args['user_id']) ) {
+            if ( ! empty( $args['user_id'] ) ) {
                 $where['e.user_id'] = $args['user_id'];
             }
-            $query[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+            $query[] = FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
 
 			if ( $args['group_by'] ) {
-				$query[] = ' GROUP BY '. sanitize_text_field( $args['group_by'] );
+				$query[] = ' GROUP BY ' . sanitize_text_field( $args['group_by'] );
 			}
             return;
         }
@@ -329,27 +329,27 @@  discard block
 block discarded – undo
 			$draft_where = $wpdb->prepare( ' AND e.is_draft=%d', 1 );
         }
 
-        if ( ! empty($args['user_id']) ) {
-            $user_where = $wpdb->prepare(' AND e.user_id=%d', $args['user_id']);
+        if ( ! empty( $args['user_id'] ) ) {
+            $user_where = $wpdb->prepare( ' AND e.user_id=%d', $args['user_id'] );
         }
 
-        if ( strpos($where, ' GROUP BY ') ) {
+        if ( strpos( $where, ' GROUP BY ' ) ) {
             // don't inject WHERE filtering after GROUP BY
-            $parts = explode(' GROUP BY ', $where);
+            $parts = explode( ' GROUP BY ', $where );
             $where = $parts[0];
             $where .= $draft_where . $user_where;
-            $where .= ' GROUP BY '. $parts[1];
+            $where .= ' GROUP BY ' . $parts[1];
         } else {
             $where .= $draft_where . $user_where;
         }
 
 		// The query has already been prepared
-		$query[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
+		$query[] = FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
     }
 
     public static function search_entry_metas( $search, $field_id = '', $operator ) {
-        $cache_key = 'search_'. maybe_serialize($search) . $field_id . $operator;
-        $results = wp_cache_get($cache_key, 'frm_entry');
+        $cache_key = 'search_' . maybe_serialize( $search ) . $field_id . $operator;
+        $results = wp_cache_get( $cache_key, 'frm_entry' );
         if ( false !== $results ) {
             return $results;
         }
@@ -364,27 +364,27 @@  discard block
 block discarded – undo
 
                 switch ( $field ) {
                     case 'year':
-                        $value = '%'. $value;
+                        $value = '%' . $value;
                     break;
                     case 'month':
                         $value .= '%';
                     break;
                     case 'day':
-                        $value = '%'. $value .'%';
+                        $value = '%' . $value . '%';
                 }
-                $where .= $wpdb->prepare(' meta_value '. $operator .' %s and', $value);
+                $where .= $wpdb->prepare( ' meta_value ' . $operator . ' %s and', $value );
             }
-            $where .= $wpdb->prepare(' field_id=%d', $field_id);
-            $query = "SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas". FrmAppHelper::prepend_and_or_where(' WHERE ', $where);
+            $where .= $wpdb->prepare( ' field_id=%d', $field_id );
+            $query = "SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas" . FrmAppHelper::prepend_and_or_where( ' WHERE ', $where );
         } else {
 			if ( $operator == 'LIKE' ) {
                 $search = '%' . $search . '%';
 			}
-            $query = $wpdb->prepare("SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas WHERE meta_value {$operator} %s and field_id = %d", $search, $field_id);
+            $query = $wpdb->prepare( "SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas WHERE meta_value {$operator} %s and field_id = %d", $search, $field_id );
         }
 
-        $results = $wpdb->get_col($query, 0);
-        wp_cache_set($cache_key, $results, 'frm_entry', 300);
+        $results = $wpdb->get_col( $query, 0 );
+        wp_cache_set( $cache_key, $results, 'frm_entry', 300 );
 
         return $results;
     }

Please login to merge, or discard this patch.

		@@ -5,27 +5,27 @@ discard block
		block discarded – undo
5	5
6	6	class FrmEntryMeta {
7	7
8		- /**
9		- * @param string $meta_key
10		- */
	8	+ /**
	9	+ * @param string $meta_key
	10	+ */
11	11	public static function add_entry_meta( $entry_id, $field_id, $meta_key = null, $meta_value ) {
12		- global $wpdb;
	12	+ global $wpdb;
13	13
14		- if ( FrmAppHelper::is_empty_value( $meta_value ) ) {
15		- // don't save blank fields
16		- return;
17		- }
	14	+ if ( FrmAppHelper::is_empty_value( $meta_value ) ) {
	15	+ // don't save blank fields
	16	+ return;
	17	+ }
18	18
19		- $new_values = array(
	19	+ $new_values = array(
20	20	'meta_value' => is_array( $meta_value ) ? serialize( array_filter( $meta_value, 'FrmAppHelper::is_not_empty_value' ) ) : trim( $meta_value ),
21		- 'item_id' => $entry_id,
22		- 'field_id' => $field_id,
23		- 'created_at' => current_time('mysql', 1),
24		- );
	21	+ 'item_id' => $entry_id,
	22	+ 'field_id' => $field_id,
	23	+ 'created_at' => current_time('mysql', 1),
	24	+ );
25	25
26		- $new_values = apply_filters('frm_add_entry_meta', $new_values);
	26	+ $new_values = apply_filters('frm_add_entry_meta', $new_values);
27	27
28		- $query_results = $wpdb->insert( $wpdb->prefix .'frm_item_metas', $new_values );
	28	+ $query_results = $wpdb->insert( $wpdb->prefix .'frm_item_metas', $new_values );
29	29
30	30	if ( $query_results ) {
31	31	self::clear_cache();
		@@ -34,40 +34,40 @@ discard block
		block discarded – undo
34	34	$id = 0;
35	35	}
36	36
37		- return $id;
38		- }
	37	+ return $id;
	38	+ }
39	39
40		- /**
41		- * @param string $meta_key
42		- */
	40	+ /**
	41	+ * @param string $meta_key
	42	+ */
43	43	public static function update_entry_meta( $entry_id, $field_id, $meta_key = null, $meta_value ) {
44		- if ( ! $field_id ) {
45		- return false;
46		- }
	44	+ if ( ! $field_id ) {
	45	+ return false;
	46	+ }
47	47
48		- global $wpdb;
	48	+ global $wpdb;
49	49
50		- $values = $where_values = array( 'item_id' => $entry_id, 'field_id' => $field_id );
51		- $values['meta_value'] = $meta_value;
52		- $values = apply_filters('frm_update_entry_meta', $values);
	50	+ $values = $where_values = array( 'item_id' => $entry_id, 'field_id' => $field_id );
	51	+ $values['meta_value'] = $meta_value;
	52	+ $values = apply_filters('frm_update_entry_meta', $values);
53	53	if ( is_array($values['meta_value']) ) {
54	54	$values['meta_value'] = array_filter( $values['meta_value'], 'FrmAppHelper::is_not_empty_value' );
55	55	}
56		- $meta_value = maybe_serialize($values['meta_value']);
	56	+ $meta_value = maybe_serialize($values['meta_value']);
57	57
58		- wp_cache_delete( $entry_id, 'frm_entry');
	58	+ wp_cache_delete( $entry_id, 'frm_entry');
59	59	self::clear_cache();
60	60
61		- return $wpdb->update( $wpdb->prefix .'frm_item_metas', array( 'meta_value' => $meta_value ), $where_values );
62		- }
	61	+ return $wpdb->update( $wpdb->prefix .'frm_item_metas', array( 'meta_value' => $meta_value ), $where_values );
	62	+ }
63	63
64	64	public static function update_entry_metas( $entry_id, $values ) {
65		- global $wpdb;
	65	+ global $wpdb;
66	66
67	67	$prev_values = FrmDb::get_col( $wpdb->prefix .'frm_item_metas', array( 'item_id' => $entry_id, 'field_id !' => 0 ), 'field_id' );
68	68
69		- foreach ( $values as $field_id => $meta_value ) {
70		- // set the value for the file upload field and add new tags (in Pro version)
	69	+ foreach ( $values as $field_id => $meta_value ) {
	70	+ // set the value for the file upload field and add new tags (in Pro version)
71	71	$meta_value = apply_filters( 'frm_prepare_data_before_db', $meta_value, $field_id, $entry_id );
72	72
73	73	if ( $prev_values && in_array($field_id, $prev_values) ) {
		@@ -85,39 +85,39 @@ discard block
		block discarded – undo
85	85	}
86	86	}
87	87
88		- if ( empty($prev_values) ) {
89		- return;
90		- }
	88	+ if ( empty($prev_values) ) {
	89	+ return;
	90	+ }
91	91
92		- $prev_values = array_diff($prev_values, array_keys($values));
	92	+ $prev_values = array_diff($prev_values, array_keys($values));
93	93
94		- if ( empty($prev_values) ) {
95		- return;
96		- }
	94	+ if ( empty($prev_values) ) {
	95	+ return;
	96	+ }
97	97
98	98	// prepare the query
99	99	$where = array( 'item_id' => $entry_id, 'field_id' => $prev_values );
100	100	FrmDb::get_where_clause_and_values( $where );
101	101
102		- // Delete any leftovers
103		- $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_item_metas ' . $where['where'], $where['values'] ) );
	102	+ // Delete any leftovers
	103	+ $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_item_metas ' . $where['where'], $where['values'] ) );
104	104	self::clear_cache();
105		- }
	105	+ }
106	106
107	107	public static function duplicate_entry_metas( $old_id, $new_id ) {
108		- $metas = self::get_entry_meta_info($old_id);
109		- foreach ( $metas as $meta ) {
110		- self::add_entry_meta($new_id, $meta->field_id, null, $meta->meta_value);
111		- unset($meta);
112		- }
	108	+ $metas = self::get_entry_meta_info($old_id);
	109	+ foreach ( $metas as $meta ) {
	110	+ self::add_entry_meta($new_id, $meta->field_id, null, $meta->meta_value);
	111	+ unset($meta);
	112	+ }
113	113	self::clear_cache();
114		- }
	114	+ }
115	115
116	116	public static function delete_entry_meta( $entry_id, $field_id ) {
117		- global $wpdb;
	117	+ global $wpdb;
118	118	self::clear_cache();
119		- return $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->prefix}frm_item_metas WHERE field_id=%d AND item_id=%d", $field_id, $entry_id));
120		- }
	119	+ return $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->prefix}frm_item_metas WHERE field_id=%d AND item_id=%d", $field_id, $entry_id));
	120	+ }
121	121
122	122	/**
123	123	* Clear entry meta caching
		@@ -142,7 +142,7 @@ discard block
		block discarded – undo
142	142	}
143	143
144	144	public static function get_entry_meta_by_field( $entry_id, $field_id ) {
145		- global $wpdb;
	145	+ global $wpdb;
146	146
147	147	if ( is_object( $entry_id ) ) {
148	148	$entry = $entry_id;
		@@ -155,24 +155,24 @@ discard block
		block discarded – undo
155	155
156	156	if ( $cached && isset( $cached->metas ) && isset( $cached->metas[ $field_id ] ) ) {
157	157	$result = $cached->metas[ $field_id ];
158		- return stripslashes_deep($result);
159		- }
	158	+ return stripslashes_deep($result);
	159	+ }
160	160
161	161	$get_table = $wpdb->prefix .'frm_item_metas';
162	162	$query = array( 'item_id' => $entry_id );
163		- if ( is_numeric($field_id) ) {
	163	+ if ( is_numeric($field_id) ) {
164	164	$query['field_id'] = $field_id;
165		- } else {
	165	+ } else {
166	166	$get_table .= ' it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id';
167	167	$query['fi.field_key'] = $field_id;
168		- }
	168	+ }
169	169
170	170	$result = FrmDb::get_var( $get_table, $query, 'meta_value' );
171		- $result = maybe_unserialize($result);
172		- $result = stripslashes_deep($result);
	171	+ $result = maybe_unserialize($result);
	172	+ $result = stripslashes_deep($result);
173	173
174		- return $result;
175		- }
	174	+ return $result;
	175	+ }
176	176
177	177	public static function get_entry_meta( $entry_id, $field_id ) {
178	178	_deprecated_function( __FUNCTION__, '2.0', 'FrmEntryMeta::get_entry_meta_by_field' );
		@@ -180,117 +180,117 @@ discard block
		block discarded – undo
180	180	}
181	181
182	182	public static function get_entry_metas( $entry_id ) {
183		- _deprecated_function( __FUNCTION__, '1.07.10');
	183	+ _deprecated_function( __FUNCTION__, '1.07.10');
184	184
185		- global $wpdb;
	185	+ global $wpdb;
186	186	return FrmDb::get_col( $wpdb->prefix . 'frm_item_metas', array( 'item_id' => $entry_id ), 'meta_value' );
187		- }
	187	+ }
188	188
189		- public static function get_entry_metas_for_field( $field_id, $order = '', $limit = '', $args = array() ) {
	189	+ public static function get_entry_metas_for_field( $field_id, $order = '', $limit = '', $args = array() ) {
190	190	$defaults = array( 'value' => false, 'unique' => false, 'stripslashes' => true, 'is_draft' => false );
191		- $args = wp_parse_args( $args, $defaults );
	191	+ $args = wp_parse_args( $args, $defaults );
192	192
193		- $query = array();
194		- self::meta_field_query($field_id, $order, $limit, $args, $query);
195		- $query = implode(' ', $query);
	193	+ $query = array();
	194	+ self::meta_field_query($field_id, $order, $limit, $args, $query);
	195	+ $query = implode(' ', $query);
196	196
197		- $cache_key = 'entry_metas_for_field_'. $field_id . $order . $limit . maybe_serialize($args);
198		- $values = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, 'get_col');
	197	+ $cache_key = 'entry_metas_for_field_'. $field_id . $order . $limit . maybe_serialize($args);
	198	+ $values = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, 'get_col');
199	199
200		- if ( ! $args['stripslashes'] ) {
201		- return $values;
202		- }
	200	+ if ( ! $args['stripslashes'] ) {
	201	+ return $values;
	202	+ }
203	203
204	204	foreach ( $values as $k => $v ) {
205	205	$values[ $k ] = maybe_unserialize( $v );
206		- unset($k, $v);
207		- }
	206	+ unset($k, $v);
	207	+ }
208	208
209		- return stripslashes_deep($values);
210		- }
	209	+ return stripslashes_deep($values);
	210	+ }
211	211
212		- /**
213		- * @param string $order
214		- * @param string $limit
215		- */
	212	+ /**
	213	+ * @param string $order
	214	+ * @param string $limit
	215	+ */
216	216	private static function meta_field_query( $field_id, $order, $limit, $args, array &$query ) {
217		- global $wpdb;
218		- $query[] = 'SELECT';
219		- $query[] = $args['unique'] ? 'DISTINCT(em.meta_value)' : 'em.meta_value';
220		- $query[] = 'FROM '. $wpdb->prefix .'frm_item_metas em ';
221		-
222		- if ( ! $args['is_draft'] ) {
223		- $query[] = 'INNER JOIN '. $wpdb->prefix .'frm_items e ON (e.id=em.item_id)';
224		- }
225		-
226		- if ( is_numeric($field_id) ) {
227		- $query[] = $wpdb->prepare('WHERE em.field_id=%d', $field_id);
228		- } else {
229		- $query[] = $wpdb->prepare('LEFT JOIN '. $wpdb->prefix .'frm_fields fi ON (em.field_id = fi.id) WHERE fi.field_key=%s', $field_id);
230		- }
231		-
232		- if ( ! $args['is_draft'] ) {
233		- $query[] = 'AND e.is_draft=0';
234		- }
235		-
236		- if ( $args['value'] ) {
237		- $query[] = $wpdb->prepare(' AND meta_value=%s', $args['value']);
238		- }
239		- $query[] = $order . $limit;
240		- }
	217	+ global $wpdb;
	218	+ $query[] = 'SELECT';
	219	+ $query[] = $args['unique'] ? 'DISTINCT(em.meta_value)' : 'em.meta_value';
	220	+ $query[] = 'FROM '. $wpdb->prefix .'frm_item_metas em ';
	221	+
	222	+ if ( ! $args['is_draft'] ) {
	223	+ $query[] = 'INNER JOIN '. $wpdb->prefix .'frm_items e ON (e.id=em.item_id)';
	224	+ }
	225	+
	226	+ if ( is_numeric($field_id) ) {
	227	+ $query[] = $wpdb->prepare('WHERE em.field_id=%d', $field_id);
	228	+ } else {
	229	+ $query[] = $wpdb->prepare('LEFT JOIN '. $wpdb->prefix .'frm_fields fi ON (em.field_id = fi.id) WHERE fi.field_key=%s', $field_id);
	230	+ }
	231	+
	232	+ if ( ! $args['is_draft'] ) {
	233	+ $query[] = 'AND e.is_draft=0';
	234	+ }
	235	+
	236	+ if ( $args['value'] ) {
	237	+ $query[] = $wpdb->prepare(' AND meta_value=%s', $args['value']);
	238	+ }
	239	+ $query[] = $order . $limit;
	240	+ }
241	241
242	242	public static function get_entry_meta_info( $entry_id ) {
243	243	return FrmDb::get_results( 'frm_item_metas', array( 'item_id' => $entry_id ) );
244		- }
	244	+ }
245	245
246	246	public static function getAll( $where = array(), $order_by = '', $limit = '', $stripslashes = false ) {
247		- global $wpdb;
248		- $query = 'SELECT it.*, fi.type as field_type, fi.field_key as field_key,
	247	+ global $wpdb;
	248	+ $query = 'SELECT it.*, fi.type as field_type, fi.field_key as field_key,
249	249	fi.required as required, fi.form_id as field_form_id, fi.name as field_name, fi.options as fi_options
250	250	FROM '. $wpdb->prefix .'frm_item_metas it LEFT OUTER JOIN '. $wpdb->prefix .'frm_fields fi ON it.field_id=fi.id' .
251		- FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
	251	+ FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
252	252
253		- $cache_key = 'all_'. maybe_serialize($where) . $order_by . $limit;
254		- $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_row' : 'get_results'));
	253	+ $cache_key = 'all_'. maybe_serialize($where) . $order_by . $limit;
	254	+ $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_row' : 'get_results'));
255	255
256		- if ( ! $results \|\| ! $stripslashes ) {
257		- return $results;
258		- }
	256	+ if ( ! $results \|\| ! $stripslashes ) {
	257	+ return $results;
	258	+ }
259	259
260		- foreach ( $results as $k => $result ) {
	260	+ foreach ( $results as $k => $result ) {
261	261	$results[ $k ]->meta_value = stripslashes_deep( maybe_unserialize( $result->meta_value ) );
262		- unset($k, $result);
263		- }
	262	+ unset($k, $result);
	263	+ }
264	264
265		- return $results;
266		- }
	265	+ return $results;
	266	+ }
267	267
268		- public static function getEntryIds( $where = array(), $order_by = '', $limit = '', $unique = true, $args = array() ) {
	268	+ public static function getEntryIds( $where = array(), $order_by = '', $limit = '', $unique = true, $args = array() ) {
269	269	$defaults = array(
270	270	'is_draft' => false,
271	271	'user_id' => '',
272	272	'group_by' => '',
273	273	);
274		- $args = wp_parse_args($args, $defaults);
	274	+ $args = wp_parse_args($args, $defaults);
275	275
276		- $query = array();
277		- self::get_ids_query($where, $order_by, $limit, $unique, $args, $query );
278		- $query = implode(' ', $query);
	276	+ $query = array();
	277	+ self::get_ids_query($where, $order_by, $limit, $unique, $args, $query );
	278	+ $query = implode(' ', $query);
279	279
280		- $cache_key = 'ids_'. maybe_serialize($where) . $order_by . 'l'. $limit . 'u'. $unique . maybe_serialize($args);
281		- $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_var' : 'get_col'));
	280	+ $cache_key = 'ids_'. maybe_serialize($where) . $order_by . 'l'. $limit . 'u'. $unique . maybe_serialize($args);
	281	+ $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_var' : 'get_col'));
282	282
283		- return $results;
284		- }
	283	+ return $results;
	284	+ }
285	285
286		- /**
287		- * @param string\|array $where
288		- * @param string $order_by
289		- * @param string $limit
290		- */
	286	+ /**
	287	+ * @param string\|array $where
	288	+ * @param string $order_by
	289	+ * @param string $limit
	290	+ */
291	291	private static function get_ids_query( $where, $order_by, $limit, $unique, $args, array &$query ) {
292		- global $wpdb;
293		- $query[] = 'SELECT';
	292	+ global $wpdb;
	293	+ $query[] = 'SELECT';
294	294
295	295	$defaults = array( 'return_parent_id' => false );
296	296	$args = array_merge( $defaults, $args );
		@@ -301,91 +301,91 @@ discard block
		block discarded – undo
301	301	$query[] = $unique ? 'DISTINCT(it.item_id)' : 'it.item_id';
302	302	}
303	303
304		- $query[] = 'FROM '. $wpdb->prefix .'frm_item_metas it LEFT OUTER JOIN '. $wpdb->prefix .'frm_fields fi ON it.field_id=fi.id';
	304	+ $query[] = 'FROM '. $wpdb->prefix .'frm_item_metas it LEFT OUTER JOIN '. $wpdb->prefix .'frm_fields fi ON it.field_id=fi.id';
305	305
306		- $query[] = 'INNER JOIN '. $wpdb->prefix .'frm_items e ON (e.id=it.item_id)';
307		- if ( is_array($where) ) {
308		- if ( ! $args['is_draft'] ) {
309		- $where['e.is_draft'] = 0;
310		- } else if ( $args['is_draft'] == 1 ) {
311		- $where['e.is_draft'] = 1;
312		- }
	306	+ $query[] = 'INNER JOIN '. $wpdb->prefix .'frm_items e ON (e.id=it.item_id)';
	307	+ if ( is_array($where) ) {
	308	+ if ( ! $args['is_draft'] ) {
	309	+ $where['e.is_draft'] = 0;
	310	+ } else if ( $args['is_draft'] == 1 ) {
	311	+ $where['e.is_draft'] = 1;
	312	+ }
313	313
314		- if ( ! empty($args['user_id']) ) {
315		- $where['e.user_id'] = $args['user_id'];
316		- }
317		- $query[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
	314	+ if ( ! empty($args['user_id']) ) {
	315	+ $where['e.user_id'] = $args['user_id'];
	316	+ }
	317	+ $query[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
318	318
319	319	if ( $args['group_by'] ) {
320	320	$query[] = ' GROUP BY '. sanitize_text_field( $args['group_by'] );
321	321	}
322		- return;
323		- }
	322	+ return;
	323	+ }
324	324
325	325	$draft_where = $user_where = '';
326		- if ( ! $args['is_draft'] ) {
	326	+ if ( ! $args['is_draft'] ) {
327	327	$draft_where = $wpdb->prepare( ' AND e.is_draft=%d', 0 );
328		- } else if ( $args['is_draft'] == 1 ) {
	328	+ } else if ( $args['is_draft'] == 1 ) {
329	329	$draft_where = $wpdb->prepare( ' AND e.is_draft=%d', 1 );
330		- }
331		-
332		- if ( ! empty($args['user_id']) ) {
333		- $user_where = $wpdb->prepare(' AND e.user_id=%d', $args['user_id']);
334		- }
335		-
336		- if ( strpos($where, ' GROUP BY ') ) {
337		- // don't inject WHERE filtering after GROUP BY
338		- $parts = explode(' GROUP BY ', $where);
339		- $where = $parts[0];
340		- $where .= $draft_where . $user_where;
341		- $where .= ' GROUP BY '. $parts[1];
342		- } else {
343		- $where .= $draft_where . $user_where;
344		- }
	330	+ }
	331	+
	332	+ if ( ! empty($args['user_id']) ) {
	333	+ $user_where = $wpdb->prepare(' AND e.user_id=%d', $args['user_id']);
	334	+ }
	335	+
	336	+ if ( strpos($where, ' GROUP BY ') ) {
	337	+ // don't inject WHERE filtering after GROUP BY
	338	+ $parts = explode(' GROUP BY ', $where);
	339	+ $where = $parts[0];
	340	+ $where .= $draft_where . $user_where;
	341	+ $where .= ' GROUP BY '. $parts[1];
	342	+ } else {
	343	+ $where .= $draft_where . $user_where;
	344	+ }
345	345
346	346	// The query has already been prepared
347	347	$query[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
348		- }
	348	+ }
349	349
350		- public static function search_entry_metas( $search, $field_id = '', $operator ) {
351		- $cache_key = 'search_'. maybe_serialize($search) . $field_id . $operator;
352		- $results = wp_cache_get($cache_key, 'frm_entry');
353		- if ( false !== $results ) {
354		- return $results;
355		- }
	350	+ public static function search_entry_metas( $search, $field_id = '', $operator ) {
	351	+ $cache_key = 'search_'. maybe_serialize($search) . $field_id . $operator;
	352	+ $results = wp_cache_get($cache_key, 'frm_entry');
	353	+ if ( false !== $results ) {
	354	+ return $results;
	355	+ }
356	356
357		- global $wpdb;
	357	+ global $wpdb;
358	358	if ( is_array( $search ) ) {
359		- $where = '';
	359	+ $where = '';
360	360	foreach ( $search as $field => $value ) {
361	361	if ( $value <= 0 \|\| ! in_array( $field, array( 'year', 'month', 'day' ) ) ) {
362		- continue;
363		- }
364		-
365		- switch ( $field ) {
366		- case 'year':
367		- $value = '%'. $value;
368		- break;
369		- case 'month':
370		- $value .= '%';
371		- break;
372		- case 'day':
373		- $value = '%'. $value .'%';
374		- }
375		- $where .= $wpdb->prepare(' meta_value '. $operator .' %s and', $value);
376		- }
377		- $where .= $wpdb->prepare(' field_id=%d', $field_id);
378		- $query = "SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas". FrmAppHelper::prepend_and_or_where(' WHERE ', $where);
379		- } else {
	362	+ continue;
	363	+ }
	364	+
	365	+ switch ( $field ) {
	366	+ case 'year':
	367	+ $value = '%'. $value;
	368	+ break;
	369	+ case 'month':
	370	+ $value .= '%';
	371	+ break;
	372	+ case 'day':
	373	+ $value = '%'. $value .'%';
	374	+ }
	375	+ $where .= $wpdb->prepare(' meta_value '. $operator .' %s and', $value);
	376	+ }
	377	+ $where .= $wpdb->prepare(' field_id=%d', $field_id);
	378	+ $query = "SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas". FrmAppHelper::prepend_and_or_where(' WHERE ', $where);
	379	+ } else {
380	380	if ( $operator == 'LIKE' ) {
381		- $search = '%' . $search . '%';
	381	+ $search = '%' . $search . '%';
382	382	}
383		- $query = $wpdb->prepare("SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas WHERE meta_value {$operator} %s and field_id = %d", $search, $field_id);
384		- }
	383	+ $query = $wpdb->prepare("SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas WHERE meta_value {$operator} %s and field_id = %d", $search, $field_id);
	384	+ }
385	385
386		- $results = $wpdb->get_col($query, 0);
387		- wp_cache_set($cache_key, $results, 'frm_entry', 300);
	386	+ $results = $wpdb->get_col($query, 0);
	387	+ wp_cache_set($cache_key, $results, 'frm_entry', 300);
388	388
389		- return $results;
390		- }
	389	+ return $results;
	390	+ }
391	391	}

		@@ -1,5 +1,5 @@ discard block
		block discarded – undo
1	1	<?php
2		-if ( ! defined('ABSPATH') ) {
	2	+if ( ! defined( 'ABSPATH' ) ) {
3	3	die( 'You are not allowed to call this page directly.' );
4	4	}
5	5
		@@ -20,12 +20,12 @@ discard block
		block discarded – undo
20	20	'meta_value' => is_array( $meta_value ) ? serialize( array_filter( $meta_value, 'FrmAppHelper::is_not_empty_value' ) ) : trim( $meta_value ),
21	21	'item_id' => $entry_id,
22	22	'field_id' => $field_id,
23		- 'created_at' => current_time('mysql', 1),
	23	+ 'created_at' => current_time( 'mysql', 1 ),
24	24	);
25	25
26		- $new_values = apply_filters('frm_add_entry_meta', $new_values);
	26	+ $new_values = apply_filters( 'frm_add_entry_meta', $new_values );
27	27
28		- $query_results = $wpdb->insert( $wpdb->prefix .'frm_item_metas', $new_values );
	28	+ $query_results = $wpdb->insert( $wpdb->prefix . 'frm_item_metas', $new_values );
29	29
30	30	if ( $query_results ) {
31	31	self::clear_cache();
		@@ -49,32 +49,32 @@ discard block
		block discarded – undo
49	49
50	50	$values = $where_values = array( 'item_id' => $entry_id, 'field_id' => $field_id );
51	51	$values['meta_value'] = $meta_value;
52		- $values = apply_filters('frm_update_entry_meta', $values);
53		- if ( is_array($values['meta_value']) ) {
	52	+ $values = apply_filters( 'frm_update_entry_meta', $values );
	53	+ if ( is_array( $values['meta_value'] ) ) {
54	54	$values['meta_value'] = array_filter( $values['meta_value'], 'FrmAppHelper::is_not_empty_value' );
55	55	}
56		- $meta_value = maybe_serialize($values['meta_value']);
	56	+ $meta_value = maybe_serialize( $values['meta_value'] );
57	57
58		- wp_cache_delete( $entry_id, 'frm_entry');
	58	+ wp_cache_delete( $entry_id, 'frm_entry' );
59	59	self::clear_cache();
60	60
61		- return $wpdb->update( $wpdb->prefix .'frm_item_metas', array( 'meta_value' => $meta_value ), $where_values );
	61	+ return $wpdb->update( $wpdb->prefix . 'frm_item_metas', array( 'meta_value' => $meta_value ), $where_values );
62	62	}
63	63
64	64	public static function update_entry_metas( $entry_id, $values ) {
65	65	global $wpdb;
66	66
67		- $prev_values = FrmDb::get_col( $wpdb->prefix .'frm_item_metas', array( 'item_id' => $entry_id, 'field_id !' => 0 ), 'field_id' );
	67	+ $prev_values = FrmDb::get_col( $wpdb->prefix . 'frm_item_metas', array( 'item_id' => $entry_id, 'field_id !' => 0 ), 'field_id' );
68	68
69	69	foreach ( $values as $field_id => $meta_value ) {
70	70	// set the value for the file upload field and add new tags (in Pro version)
71	71	$meta_value = apply_filters( 'frm_prepare_data_before_db', $meta_value, $field_id, $entry_id );
72	72
73		- if ( $prev_values && in_array($field_id, $prev_values) ) {
	73	+ if ( $prev_values && in_array( $field_id, $prev_values ) ) {
74	74
75	75	if ( ( is_array( $meta_value ) && empty( $meta_value ) ) \|\| ( ! is_array( $meta_value ) && trim( $meta_value ) == '' ) ) {
76	76	// remove blank fields
77		- unset( $values[ $field_id ] );
	77	+ unset( $values[$field_id] );
78	78	} else {
79	79	// if value exists, then update it
80	80	self::update_entry_meta( $entry_id, $field_id, '', $meta_value );
		@@ -85,13 +85,13 @@ discard block
		block discarded – undo
85	85	}
86	86	}
87	87
88		- if ( empty($prev_values) ) {
	88	+ if ( empty( $prev_values ) ) {
89	89	return;
90	90	}
91	91
92		- $prev_values = array_diff($prev_values, array_keys($values));
	92	+ $prev_values = array_diff( $prev_values, array_keys( $values ) );
93	93
94		- if ( empty($prev_values) ) {
	94	+ if ( empty( $prev_values ) ) {
95	95	return;
96	96	}
97	97
		@@ -105,10 +105,10 @@ discard block
		block discarded – undo
105	105	}
106	106
107	107	public static function duplicate_entry_metas( $old_id, $new_id ) {
108		- $metas = self::get_entry_meta_info($old_id);
	108	+ $metas = self::get_entry_meta_info( $old_id );
109	109	foreach ( $metas as $meta ) {
110		- self::add_entry_meta($new_id, $meta->field_id, null, $meta->meta_value);
111		- unset($meta);
	110	+ self::add_entry_meta( $new_id, $meta->field_id, null, $meta->meta_value );
	111	+ unset( $meta );
112	112	}
113	113	self::clear_cache();
114	114	}
		@@ -116,7 +116,7 @@ discard block
		block discarded – undo
116	116	public static function delete_entry_meta( $entry_id, $field_id ) {
117	117	global $wpdb;
118	118	self::clear_cache();
119		- return $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->prefix}frm_item_metas WHERE field_id=%d AND item_id=%d", $field_id, $entry_id));
	119	+ return $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->prefix}frm_item_metas WHERE field_id=%d AND item_id=%d", $field_id, $entry_id ) );
120	120	}
121	121
122	122	/**
		@@ -135,7 +135,7 @@ discard block
		block discarded – undo
135	135	*/
136	136	public static function get_meta_value( $entry, $field_id ) {
137	137	if ( isset( $entry->metas ) ) {
138		- return isset( $entry->metas[ $field_id ] ) ? $entry->metas[ $field_id ] : false;
	138	+ return isset( $entry->metas[$field_id] ) ? $entry->metas[$field_id] : false;
139	139	} else {
140	140	return self::get_entry_meta_by_field( $entry->id, $field_id );
141	141	}
		@@ -153,14 +153,14 @@ discard block
		block discarded – undo
153	153	$cached = FrmAppHelper::check_cache( $entry_id, 'frm_entry' );
154	154	}
155	155
156		- if ( $cached && isset( $cached->metas ) && isset( $cached->metas[ $field_id ] ) ) {
157		- $result = $cached->metas[ $field_id ];
158		- return stripslashes_deep($result);
	156	+ if ( $cached && isset( $cached->metas ) && isset( $cached->metas[$field_id] ) ) {
	157	+ $result = $cached->metas[$field_id];
	158	+ return stripslashes_deep( $result );
159	159	}
160	160
161		- $get_table = $wpdb->prefix .'frm_item_metas';
	161	+ $get_table = $wpdb->prefix . 'frm_item_metas';
162	162	$query = array( 'item_id' => $entry_id );
163		- if ( is_numeric($field_id) ) {
	163	+ if ( is_numeric( $field_id ) ) {
164	164	$query['field_id'] = $field_id;
165	165	} else {
166	166	$get_table .= ' it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id';
		@@ -168,8 +168,8 @@ discard block
		block discarded – undo
168	168	}
169	169
170	170	$result = FrmDb::get_var( $get_table, $query, 'meta_value' );
171		- $result = maybe_unserialize($result);
172		- $result = stripslashes_deep($result);
	171	+ $result = maybe_unserialize( $result );
	172	+ $result = stripslashes_deep( $result );
173	173
174	174	return $result;
175	175	}
		@@ -180,7 +180,7 @@ discard block
		block discarded – undo
180	180	}
181	181
182	182	public static function get_entry_metas( $entry_id ) {
183		- _deprecated_function( __FUNCTION__, '1.07.10');
	183	+ _deprecated_function( __FUNCTION__, '1.07.10' );
184	184
185	185	global $wpdb;
186	186	return FrmDb::get_col( $wpdb->prefix . 'frm_item_metas', array( 'item_id' => $entry_id ), 'meta_value' );
		@@ -191,22 +191,22 @@ discard block
		block discarded – undo
191	191	$args = wp_parse_args( $args, $defaults );
192	192
193	193	$query = array();
194		- self::meta_field_query($field_id, $order, $limit, $args, $query);
195		- $query = implode(' ', $query);
	194	+ self::meta_field_query( $field_id, $order, $limit, $args, $query );
	195	+ $query = implode( ' ', $query );
196	196
197		- $cache_key = 'entry_metas_for_field_'. $field_id . $order . $limit . maybe_serialize($args);
198		- $values = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, 'get_col');
	197	+ $cache_key = 'entry_metas_for_field_' . $field_id . $order . $limit . maybe_serialize( $args );
	198	+ $values = FrmAppHelper::check_cache( $cache_key, 'frm_entry', $query, 'get_col' );
199	199
200	200	if ( ! $args['stripslashes'] ) {
201	201	return $values;
202	202	}
203	203
204	204	foreach ( $values as $k => $v ) {
205		- $values[ $k ] = maybe_unserialize( $v );
206		- unset($k, $v);
	205	+ $values[$k] = maybe_unserialize( $v );
	206	+ unset( $k, $v );
207	207	}
208	208
209		- return stripslashes_deep($values);
	209	+ return stripslashes_deep( $values );
210	210	}
211	211
212	212	/**
		@@ -217,16 +217,16 @@ discard block
		block discarded – undo
217	217	global $wpdb;
218	218	$query[] = 'SELECT';
219	219	$query[] = $args['unique'] ? 'DISTINCT(em.meta_value)' : 'em.meta_value';
220		- $query[] = 'FROM '. $wpdb->prefix .'frm_item_metas em ';
	220	+ $query[] = 'FROM ' . $wpdb->prefix . 'frm_item_metas em ';
221	221
222	222	if ( ! $args['is_draft'] ) {
223		- $query[] = 'INNER JOIN '. $wpdb->prefix .'frm_items e ON (e.id=em.item_id)';
	223	+ $query[] = 'INNER JOIN ' . $wpdb->prefix . 'frm_items e ON (e.id=em.item_id)';
224	224	}
225	225
226		- if ( is_numeric($field_id) ) {
227		- $query[] = $wpdb->prepare('WHERE em.field_id=%d', $field_id);
	226	+ if ( is_numeric( $field_id ) ) {
	227	+ $query[] = $wpdb->prepare( 'WHERE em.field_id=%d', $field_id );
228	228	} else {
229		- $query[] = $wpdb->prepare('LEFT JOIN '. $wpdb->prefix .'frm_fields fi ON (em.field_id = fi.id) WHERE fi.field_key=%s', $field_id);
	229	+ $query[] = $wpdb->prepare( 'LEFT JOIN ' . $wpdb->prefix . 'frm_fields fi ON (em.field_id = fi.id) WHERE fi.field_key=%s', $field_id );
230	230	}
231	231
232	232	if ( ! $args['is_draft'] ) {
		@@ -234,7 +234,7 @@ discard block
		block discarded – undo
234	234	}
235	235
236	236	if ( $args['value'] ) {
237		- $query[] = $wpdb->prepare(' AND meta_value=%s', $args['value']);
	237	+ $query[] = $wpdb->prepare( ' AND meta_value=%s', $args['value'] );
238	238	}
239	239	$query[] = $order . $limit;
240	240	}
		@@ -247,19 +247,19 @@ discard block
		block discarded – undo
247	247	global $wpdb;
248	248	$query = 'SELECT it.*, fi.type as field_type, fi.field_key as field_key,
249	249	fi.required as required, fi.form_id as field_form_id, fi.name as field_name, fi.options as fi_options
250		- FROM '. $wpdb->prefix .'frm_item_metas it LEFT OUTER JOIN '. $wpdb->prefix .'frm_fields fi ON it.field_id=fi.id' .
251		- FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
	250	+ FROM '. $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id' .
	251	+ FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
252	252
253		- $cache_key = 'all_'. maybe_serialize($where) . $order_by . $limit;
254		- $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_row' : 'get_results'));
	253	+ $cache_key = 'all_' . maybe_serialize( $where ) . $order_by . $limit;
	254	+ $results = FrmAppHelper::check_cache( $cache_key, 'frm_entry', $query, ( $limit == ' LIMIT 1' ? 'get_row' : 'get_results' ) );
255	255
256	256	if ( ! $results \|\| ! $stripslashes ) {
257	257	return $results;
258	258	}
259	259
260	260	foreach ( $results as $k => $result ) {
261		- $results[ $k ]->meta_value = stripslashes_deep( maybe_unserialize( $result->meta_value ) );
262		- unset($k, $result);
	261	+ $results[$k]->meta_value = stripslashes_deep( maybe_unserialize( $result->meta_value ) );
	262	+ unset( $k, $result );
263	263	}
264	264
265	265	return $results;
		@@ -271,14 +271,14 @@ discard block
		block discarded – undo
271	271	'user_id' => '',
272	272	'group_by' => '',
273	273	);
274		- $args = wp_parse_args($args, $defaults);
	274	+ $args = wp_parse_args( $args, $defaults );
275	275
276	276	$query = array();
277		- self::get_ids_query($where, $order_by, $limit, $unique, $args, $query );
278		- $query = implode(' ', $query);
	277	+ self::get_ids_query( $where, $order_by, $limit, $unique, $args, $query );
	278	+ $query = implode( ' ', $query );
279	279
280		- $cache_key = 'ids_'. maybe_serialize($where) . $order_by . 'l'. $limit . 'u'. $unique . maybe_serialize($args);
281		- $results = FrmAppHelper::check_cache($cache_key, 'frm_entry', $query, ($limit == ' LIMIT 1' ? 'get_var' : 'get_col'));
	280	+ $cache_key = 'ids_' . maybe_serialize( $where ) . $order_by . 'l' . $limit . 'u' . $unique . maybe_serialize( $args );
	281	+ $results = FrmAppHelper::check_cache( $cache_key, 'frm_entry', $query, ( $limit == ' LIMIT 1' ? 'get_var' : 'get_col' ) );
282	282
283	283	return $results;
284	284	}
		@@ -301,23 +301,23 @@ discard block
		block discarded – undo
301	301	$query[] = $unique ? 'DISTINCT(it.item_id)' : 'it.item_id';
302	302	}
303	303
304		- $query[] = 'FROM '. $wpdb->prefix .'frm_item_metas it LEFT OUTER JOIN '. $wpdb->prefix .'frm_fields fi ON it.field_id=fi.id';
	304	+ $query[] = 'FROM ' . $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id';
305	305
306		- $query[] = 'INNER JOIN '. $wpdb->prefix .'frm_items e ON (e.id=it.item_id)';
307		- if ( is_array($where) ) {
	306	+ $query[] = 'INNER JOIN ' . $wpdb->prefix . 'frm_items e ON (e.id=it.item_id)';
	307	+ if ( is_array( $where ) ) {
308	308	if ( ! $args['is_draft'] ) {
309	309	$where['e.is_draft'] = 0;
310	310	} else if ( $args['is_draft'] == 1 ) {
311	311	$where['e.is_draft'] = 1;
312	312	}
313	313
314		- if ( ! empty($args['user_id']) ) {
	314	+ if ( ! empty( $args['user_id'] ) ) {
315	315	$where['e.user_id'] = $args['user_id'];
316	316	}
317		- $query[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
	317	+ $query[] = FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
318	318
319	319	if ( $args['group_by'] ) {
320		- $query[] = ' GROUP BY '. sanitize_text_field( $args['group_by'] );
	320	+ $query[] = ' GROUP BY ' . sanitize_text_field( $args['group_by'] );
321	321	}
322	322	return;
323	323	}
		@@ -329,27 +329,27 @@ discard block
		block discarded – undo
329	329	$draft_where = $wpdb->prepare( ' AND e.is_draft=%d', 1 );
330	330	}
331	331
332		- if ( ! empty($args['user_id']) ) {
333		- $user_where = $wpdb->prepare(' AND e.user_id=%d', $args['user_id']);
	332	+ if ( ! empty( $args['user_id'] ) ) {
	333	+ $user_where = $wpdb->prepare( ' AND e.user_id=%d', $args['user_id'] );
334	334	}
335	335
336		- if ( strpos($where, ' GROUP BY ') ) {
	336	+ if ( strpos( $where, ' GROUP BY ' ) ) {
337	337	// don't inject WHERE filtering after GROUP BY
338		- $parts = explode(' GROUP BY ', $where);
	338	+ $parts = explode( ' GROUP BY ', $where );
339	339	$where = $parts[0];
340	340	$where .= $draft_where . $user_where;
341		- $where .= ' GROUP BY '. $parts[1];
	341	+ $where .= ' GROUP BY ' . $parts[1];
342	342	} else {
343	343	$where .= $draft_where . $user_where;
344	344	}
345	345
346	346	// The query has already been prepared
347		- $query[] = FrmAppHelper::prepend_and_or_where(' WHERE ', $where) . $order_by . $limit;
	347	+ $query[] = FrmAppHelper::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit;
348	348	}
349	349
350	350	public static function search_entry_metas( $search, $field_id = '', $operator ) {
351		- $cache_key = 'search_'. maybe_serialize($search) . $field_id . $operator;
352		- $results = wp_cache_get($cache_key, 'frm_entry');
	351	+ $cache_key = 'search_' . maybe_serialize( $search ) . $field_id . $operator;
	352	+ $results = wp_cache_get( $cache_key, 'frm_entry' );
353	353	if ( false !== $results ) {
354	354	return $results;
355	355	}
		@@ -364,27 +364,27 @@ discard block
		block discarded – undo
364	364
365	365	switch ( $field ) {
366	366	case 'year':
367		- $value = '%'. $value;
	367	+ $value = '%' . $value;
368	368	break;
369	369	case 'month':
370	370	$value .= '%';
371	371	break;
372	372	case 'day':
373		- $value = '%'. $value .'%';
	373	+ $value = '%' . $value . '%';
374	374	}
375		- $where .= $wpdb->prepare(' meta_value '. $operator .' %s and', $value);
	375	+ $where .= $wpdb->prepare( ' meta_value ' . $operator . ' %s and', $value );
376	376	}
377		- $where .= $wpdb->prepare(' field_id=%d', $field_id);
378		- $query = "SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas". FrmAppHelper::prepend_and_or_where(' WHERE ', $where);
	377	+ $where .= $wpdb->prepare( ' field_id=%d', $field_id );
	378	+ $query = "SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas" . FrmAppHelper::prepend_and_or_where( ' WHERE ', $where );
379	379	} else {
380	380	if ( $operator == 'LIKE' ) {
381	381	$search = '%' . $search . '%';
382	382	}
383		- $query = $wpdb->prepare("SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas WHERE meta_value {$operator} %s and field_id = %d", $search, $field_id);
	383	+ $query = $wpdb->prepare( "SELECT DISTINCT item_id FROM {$wpdb->prefix}frm_item_metas WHERE meta_value {$operator} %s and field_id = %d", $search, $field_id );
384	384	}
385	385
386		- $results = $wpdb->get_col($query, 0);
387		- wp_cache_set($cache_key, $results, 'frm_entry', 300);
	386	+ $results = $wpdb->get_col( $query, 0 );
	387	+ wp_cache_set( $cache_key, $results, 'frm_entry', 300 );
388	388
389	389	return $results;
390	390	}

Strategy11 / formidable-forms

Push — master ( 50511d...30b7fb )

Status

Category

Indentation +203 added lines, -203 removed lines patch added patch discarded remove patch

Spacing +74 added lines, -74 removed lines patch added patch discarded remove patch