| @@ -5,24 +5,19 @@ | ||
| 5 | 5 | |
| 6 | 6 | class FrmEntryMeta { |
| 7 | 7 | |
| 8 | 8 | /** |
| 9 | - * @since 6.35 Added the $field parameter. | |
| 10 | - * | |
| 11 | - * @param int $entry_id | |
| 12 | - * @param int $field_id | |
| 13 | - * @param string $meta_key usually set to '' as this parameter is no longer used. | |
| 14 | - * @param mixed $meta_value | |
| 15 | - * @param stdClass|null $field The field $field_id belongs to, when the caller already has | |
| 16 | - * it loaded. Looked up here when it is not passed. | |
| 17 | - * | |
| 9 | + * @param int $entry_id | |
| 10 | + * @param int $field_id | |
| 11 | + * @param string $meta_key usually set to '' as this parameter is no longer used. | |
| 12 | + * @param mixed $meta_value | |
| 18 | 13 | * @return int |
| 19 | 14 | */ |
| 20 | - public static function add_entry_meta( $entry_id, $field_id, $meta_key, $meta_value, $field = null ) { | |
| 15 | + public static function add_entry_meta( $entry_id, $field_id, $meta_key, $meta_value ) { | |
| 21 | 16 | global $wpdb; |
| 22 | 17 | |
| 23 | 18 | if ( FrmAppHelper::is_empty_value( $meta_value ) ) { |
| 24 | - // Don't save blank fields | |
| 19 | + // don't save blank fields | |
| 25 | 20 | return 0; |
| 26 | 21 | } |
| 27 | 22 | |
| 28 | 23 | $new_values = array( |
| @@ -31,34 +26,33 @@ | ||
| 31 | 26 | 'field_id' => $field_id, |
| 32 | 27 | 'created_at' => current_time( 'mysql', 1 ), |
| 33 | 28 | ); |
| 34 | 29 | |
| 35 | - self::set_value_before_save( $new_values, $field ); | |
| 36 | - $new_values = apply_filters( 'frm_add_entry_meta', $new_values ); | |
| 30 | + self::set_value_before_save( $new_values ); | |
| 31 | + $new_values = apply_filters( 'frm_add_entry_meta', $new_values ); | |
| 32 | + | |
| 37 | 33 | $query_results = $wpdb->insert( $wpdb->prefix . 'frm_item_metas', $new_values ); |
| 38 | 34 | |
| 39 | 35 | if ( $query_results ) { |
| 40 | 36 | self::clear_cache(); |
| 41 | 37 | wp_cache_delete( $entry_id, 'frm_entry' ); |
| 42 | - return $wpdb->insert_id; | |
| 38 | + $id = $wpdb->insert_id; | |
| 39 | + } else { | |
| 40 | + $id = 0; | |
| 43 | 41 | } |
| 44 | 42 | |
| 45 | - return 0; | |
| 43 | + return $id; | |
| 46 | 44 | } |
| 47 | 45 | |
| 48 | 46 | /** |
| 49 | - * @since 6.35 Added the $field parameter. | |
| 47 | + * @param int $entry_id | |
| 48 | + * @param int $field_id | |
| 49 | + * @param string $meta_key Deprecated. | |
| 50 | + * @param array|string $meta_value | |
| 50 | 51 | * |
| 51 | - * @param int $entry_id | |
| 52 | - * @param int $field_id | |
| 53 | - * @param string $meta_key Deprecated. | |
| 54 | - * @param array|string $meta_value | |
| 55 | - * @param stdClass|null $field The field $field_id belongs to, when the caller already has | |
| 56 | - * it loaded. Looked up here when it is not passed. | |
| 57 | - * | |
| 58 | - * @return bool|int | |
| 52 | + * @return bool|false|int | |
| 59 | 53 | */ |
| 60 | - public static function update_entry_meta( $entry_id, $field_id, $meta_key, $meta_value, $field = null ) { | |
| 54 | + public static function update_entry_meta( $entry_id, $field_id, $meta_key, $meta_value ) { | |
| 61 | 55 | if ( ! $field_id ) { |
| 62 | 56 | return false; |
| 63 | 57 | } |
| 64 | 58 | |
| @@ -69,15 +63,14 @@ | ||
| 69 | 63 | 'field_id' => $field_id, |
| 70 | 64 | ); |
| 71 | 65 | $where_values = $values; |
| 72 | 66 | $values['meta_value'] = $meta_value; |
| 73 | - self::set_value_before_save( $values, $field ); | |
| 67 | + self::set_value_before_save( $values ); | |
| 74 | 68 | $values = apply_filters( 'frm_update_entry_meta', $values ); |
| 75 | 69 | |
| 76 | 70 | if ( is_array( $values['meta_value'] ) ) { |
| 77 | 71 | $values['meta_value'] = array_filter( $values['meta_value'], 'FrmAppHelper::is_not_empty_value' ); |
| 78 | 72 | } |
| 79 | - | |
| 80 | 73 | $meta_value = maybe_serialize( $values['meta_value'] ); |
| 81 | 74 | |
| 82 | 75 | wp_cache_delete( $entry_id, 'frm_entry' ); |
| 83 | 76 | self::clear_cache(); |
| @@ -86,36 +79,20 @@ | ||
| 86 | 79 | } |
| 87 | 80 | |
| 88 | 81 | /** |
| 89 | 82 | * @since 3.0 |
| 90 | - * @since 6.35 Added the $field parameter. | |
| 91 | - * | |
| 92 | - * @param array $values | |
| 93 | - * @param stdClass|null $field The field for $values['field_id'], when the caller already has | |
| 94 | - * it loaded. Looked up here when it is not passed. | |
| 95 | - * | |
| 96 | - * @return void | |
| 97 | 83 | */ |
| 98 | - private static function set_value_before_save( &$values, $field = null ) { | |
| 99 | - if ( ! is_object( $field ) ) { | |
| 100 | - $field = FrmField::getOne( $values['field_id'] ); | |
| 101 | - } | |
| 84 | + private static function set_value_before_save( &$values ) { | |
| 85 | + $field = FrmField::getOne( $values['field_id'] ); | |
| 86 | + if ( $field ) { | |
| 87 | + $field_obj = FrmFieldFactory::get_field_object( $field ); | |
| 102 | 88 | |
| 103 | - if ( ! $field ) { | |
| 104 | - return; | |
| 89 | + $values['meta_value'] = $field_obj->set_value_before_save( $values['meta_value'] ); | |
| 105 | 90 | } |
| 106 | - | |
| 107 | - $field_obj = FrmFieldFactory::get_field_object( $field ); | |
| 108 | - $values['meta_value'] = $field_obj->set_value_before_save( $values['meta_value'] ); | |
| 109 | 91 | } |
| 110 | 92 | |
| 111 | 93 | /** |
| 112 | 94 | * @since 3.0 |
| 113 | - * | |
| 114 | - * @param array $atts | |
| 115 | - * @param mixed $value | |
| 116 | - * | |
| 117 | - * @return void | |
| 118 | 95 | */ |
| 119 | 96 | private static function get_value_to_save( $atts, &$value ) { |
| 120 | 97 | if ( is_object( $atts['field'] ) ) { |
| 121 | 98 | $field_obj = FrmFieldFactory::get_field_object( $atts['field'] ); |
| @@ -130,19 +107,13 @@ | ||
| 130 | 107 | |
| 131 | 108 | $value = apply_filters( 'frm_prepare_data_before_db', $value, $atts['field_id'], $atts['entry_id'], array( 'field' => $atts['field'] ) ); |
| 132 | 109 | } |
| 133 | 110 | |
| 134 | - /** | |
| 135 | - * @param int|string $entry_id | |
| 136 | - * @param array $values Either indexed by field ID or field key. | |
| 137 | - * | |
| 138 | - * @return void | |
| 139 | - */ | |
| 140 | 111 | public static function update_entry_metas( $entry_id, $values ) { |
| 141 | 112 | global $wpdb; |
| 142 | 113 | |
| 143 | - $previous_field_ids = FrmDb::get_col( | |
| 144 | - 'frm_item_metas', | |
| 114 | + $prev_values = FrmDb::get_col( | |
| 115 | + $wpdb->prefix . 'frm_item_metas', | |
| 145 | 116 | array( |
| 146 | 117 | 'item_id' => $entry_id, |
| 147 | 118 | 'field_id !' => 0, |
| 148 | 119 | ), |
| @@ -148,69 +119,53 @@ | ||
| 148 | 119 | ), |
| 149 | 120 | 'field_id' |
| 150 | 121 | ); |
| 151 | 122 | |
| 152 | - $values_indexed_by_field_id = array(); | |
| 153 | - | |
| 154 | - foreach ( $values as $field_id_or_key => $meta_value ) { | |
| 155 | - $field_id = $field_id_or_key; | |
| 156 | - $field = null; | |
| 157 | - | |
| 158 | - if ( $field_id_or_key ) { | |
| 159 | - $field = FrmField::getOne( $field_id_or_key ); | |
| 160 | - | |
| 161 | - if ( is_object( $field ) ) { | |
| 162 | - $field_id = $field->id; | |
| 163 | - } | |
| 123 | + foreach ( $values as $field_id => $meta_value ) { | |
| 124 | + $field = false; | |
| 125 | + if ( ! empty( $field_id ) ) { | |
| 126 | + $field = FrmField::getOne( $field_id ); | |
| 164 | 127 | } |
| 165 | 128 | |
| 166 | - $values_indexed_by_field_id[ $field_id ] = $meta_value; | |
| 167 | - | |
| 168 | 129 | self::get_value_to_save( compact( 'field', 'field_id', 'entry_id' ), $meta_value ); |
| 169 | 130 | |
| 170 | - if ( ! $previous_field_ids || ! in_array( $field_id, $previous_field_ids, true ) ) { | |
| 171 | - // If value does not exist, then create it | |
| 172 | - self::add_entry_meta( $entry_id, $field_id, '', $meta_value, $field ); | |
| 173 | - continue; | |
| 174 | - } | |
| 131 | + if ( $prev_values && in_array( $field_id, $prev_values ) ) { | |
| 175 | 132 | |
| 176 | - if ( $meta_value === array() || ( ! is_array( $meta_value ) && trim( $meta_value ) === '' ) ) { | |
| 177 | - // Remove blank fields. | |
| 178 | - unset( $values_indexed_by_field_id[ $field_id ] ); | |
| 133 | + if ( ( is_array( $meta_value ) && empty( $meta_value ) ) || ( ! is_array( $meta_value ) && trim( $meta_value ) == '' ) ) { | |
| 134 | + // remove blank fields | |
| 135 | + unset( $values[ $field_id ] ); | |
| 136 | + } else { | |
| 137 | + // if value exists, then update it | |
| 138 | + self::update_entry_meta( $entry_id, $field_id, '', $meta_value ); | |
| 139 | + } | |
| 179 | 140 | } else { |
| 180 | - // If value exists, then update it | |
| 181 | - self::update_entry_meta( $entry_id, $field_id, '', $meta_value, $field ); | |
| 141 | + // if value does not exist, then create it | |
| 142 | + self::add_entry_meta( $entry_id, $field_id, '', $meta_value ); | |
| 182 | 143 | } |
| 183 | 144 | }//end foreach |
| 184 | 145 | |
| 185 | - if ( ! $previous_field_ids ) { | |
| 146 | + if ( empty( $prev_values ) ) { | |
| 186 | 147 | return; |
| 187 | 148 | } |
| 188 | 149 | |
| 189 | - $field_ids_to_remove = array_diff( $previous_field_ids, array_keys( $values_indexed_by_field_id ) ); | |
| 150 | + $prev_values = array_diff( $prev_values, array_keys( $values ) ); | |
| 190 | 151 | |
| 191 | - if ( ! $field_ids_to_remove ) { | |
| 152 | + if ( empty( $prev_values ) ) { | |
| 192 | 153 | return; |
| 193 | 154 | } |
| 194 | 155 | |
| 195 | - // Prepare the query | |
| 156 | + // prepare the query | |
| 196 | 157 | $where = array( |
| 197 | 158 | 'item_id' => $entry_id, |
| 198 | - 'field_id' => $field_ids_to_remove, | |
| 159 | + 'field_id' => $prev_values, | |
| 199 | 160 | ); |
| 200 | 161 | FrmDb::get_where_clause_and_values( $where ); |
| 201 | 162 | |
| 202 | 163 | // Delete any leftovers |
| 203 | - $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_item_metas ' . $where['where'], $where['values'] ) ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared, SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 164 | + $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_item_metas ' . $where['where'], $where['values'] ) ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared | |
| 204 | 165 | self::clear_cache(); |
| 205 | 166 | } |
| 206 | 167 | |
| 207 | - /** | |
| 208 | - * @param int $old_id | |
| 209 | - * @param int $new_id | |
| 210 | - * | |
| 211 | - * @return void | |
| 212 | - */ | |
| 213 | 168 | public static function duplicate_entry_metas( $old_id, $new_id ) { |
| 214 | 169 | $metas = self::get_entry_meta_info( $old_id ); |
| 215 | 170 | |
| 216 | 171 | /** |
| @@ -220,9 +175,8 @@ | ||
| 220 | 175 | * |
| 221 | 176 | * @param array $metas The list of entry meta values. |
| 222 | 177 | */ |
| 223 | 178 | $metas = apply_filters( 'frm_before_duplicate_entry_values', $metas ); |
| 224 | - | |
| 225 | 179 | foreach ( $metas as $meta ) { |
| 226 | 180 | self::add_entry_meta( $new_id, $meta->field_id, '', $meta->meta_value ); |
| 227 | 181 | unset( $meta ); |
| 228 | 182 | } |
| @@ -228,14 +182,8 @@ | ||
| 228 | 182 | } |
| 229 | 183 | self::clear_cache(); |
| 230 | 184 | } |
| 231 | 185 | |
| 232 | - /** | |
| 233 | - * @param int $entry_id | |
| 234 | - * @param int $field_id | |
| 235 | - * | |
| 236 | - * @return false|int | |
| 237 | - */ | |
| 238 | 186 | public static function delete_entry_meta( $entry_id, $field_id ) { |
| 239 | 187 | global $wpdb; |
| 240 | 188 | self::clear_cache(); |
| 241 | 189 | |
| @@ -246,10 +194,8 @@ | ||
| 246 | 194 | * Clear entry meta caching |
| 247 | 195 | * Called when a meta is added or changed |
| 248 | 196 | * |
| 249 | 197 | * @since 2.0.5 |
| 250 | - * | |
| 251 | - * @return void | |
| 252 | 198 | */ |
| 253 | 199 | public static function clear_cache() { |
| 254 | 200 | FrmDb::cache_delete_group( 'frm_entry_meta' ); |
| 255 | 201 | FrmDb::cache_delete_group( 'frm_item_meta' ); |
| @@ -259,24 +205,17 @@ | ||
| 259 | 205 | * @since 2.0.9 |
| 260 | 206 | * |
| 261 | 207 | * @param stdClass $entry |
| 262 | 208 | * @param int|string $field_id |
| 263 | - * | |
| 264 | 209 | * @return mixed |
| 265 | 210 | */ |
| 266 | 211 | public static function get_meta_value( $entry, $field_id ) { |
| 267 | 212 | if ( isset( $entry->metas ) ) { |
| 268 | - return $entry->metas[ $field_id ] ?? false; | |
| 213 | + return isset( $entry->metas[ $field_id ] ) ? $entry->metas[ $field_id ] : false; | |
| 269 | 214 | } |
| 270 | 215 | return self::get_entry_meta_by_field( $entry->id, $field_id ); |
| 271 | 216 | } |
| 272 | 217 | |
| 273 | - /** | |
| 274 | - * @param int|object|string $entry_id | |
| 275 | - * @param int|string $field_id This function supports field keys as field id. | |
| 276 | - * | |
| 277 | - * @return mixed | |
| 278 | - */ | |
| 279 | 218 | public static function get_entry_meta_by_field( $entry_id, $field_id ) { |
| 280 | 219 | global $wpdb; |
| 281 | 220 | |
| 282 | 221 | if ( is_object( $entry_id ) ) { |
| @@ -289,38 +228,31 @@ | ||
| 289 | 228 | } |
| 290 | 229 | |
| 291 | 230 | if ( $cached && isset( $cached->metas ) && isset( $cached->metas[ $field_id ] ) ) { |
| 292 | 231 | $result = $cached->metas[ $field_id ]; |
| 232 | + | |
| 293 | 233 | return wp_unslash( $result ); |
| 294 | 234 | } |
| 295 | 235 | |
| 296 | 236 | $get_table = $wpdb->prefix . 'frm_item_metas'; |
| 297 | 237 | $query = array( 'item_id' => $entry_id ); |
| 298 | - | |
| 299 | 238 | if ( is_numeric( $field_id ) ) { |
| 300 | - // Query by field ID. | |
| 301 | 239 | $query['field_id'] = $field_id; |
| 302 | 240 | } else { |
| 303 | - // Query by field key. | |
| 304 | - $get_table .= ' it JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id'; | |
| 241 | + $get_table .= ' it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id'; | |
| 305 | 242 | $query['fi.field_key'] = $field_id; |
| 306 | 243 | } |
| 307 | 244 | |
| 308 | - $result = FrmDb::get_var( $get_table, $query, 'meta_value' ); | |
| 245 | + $result = FrmDb::get_var( $get_table, $query, 'meta_value' ); | |
| 246 | + | |
| 309 | 247 | $field_type = FrmField::get_type( $field_id ); |
| 310 | 248 | FrmFieldsHelper::prepare_field_value( $result, $field_type ); |
| 311 | 249 | |
| 312 | - return wp_unslash( $result ); | |
| 250 | + $result = wp_unslash( $result ); | |
| 251 | + | |
| 252 | + return $result; | |
| 313 | 253 | } |
| 314 | 254 | |
| 315 | - /** | |
| 316 | - * @param int|string $field_id | |
| 317 | - * @param string $order | |
| 318 | - * @param string $limit | |
| 319 | - * @param array $args | |
| 320 | - * | |
| 321 | - * @return array | |
| 322 | - */ | |
| 323 | 255 | public static function get_entry_metas_for_field( $field_id, $order = '', $limit = '', $args = array() ) { |
| 324 | 256 | $defaults = array( |
| 325 | 257 | 'value' => false, |
| 326 | 258 | 'unique' => false, |
| @@ -327,11 +259,13 @@ | ||
| 327 | 259 | 'stripslashes' => true, |
| 328 | 260 | 'is_draft' => false, |
| 329 | 261 | ); |
| 330 | 262 | $args = wp_parse_args( $args, $defaults ); |
| 331 | - $query = array(); | |
| 263 | + | |
| 264 | + $query = array(); | |
| 332 | 265 | self::meta_field_query( $field_id, $order, $limit, $args, $query ); |
| 333 | - $query = implode( ' ', $query ); | |
| 266 | + $query = implode( ' ', $query ); | |
| 267 | + | |
| 334 | 268 | $cache_key = 'entry_metas_for_field_' . $field_id . $order . $limit . FrmAppHelper::maybe_json_encode( $args ); |
| 335 | 269 | $values = FrmDb::check_cache( $cache_key, 'frm_entry', $query, 'get_col' ); |
| 336 | 270 | |
| 337 | 271 | if ( ! $args['stripslashes'] ) { |
| @@ -352,10 +286,8 @@ | ||
| 352 | 286 | * @param string $order |
| 353 | 287 | * @param string $limit |
| 354 | 288 | * @param array $args |
| 355 | 289 | * @param array $query |
| 356 | - * | |
| 357 | - * @return void | |
| 358 | 290 | */ |
| 359 | 291 | private static function meta_field_query( $field_id, $order, $limit, $args, array &$query ) { |
| 360 | 292 | global $wpdb; |
| 361 | 293 | $query[] = 'SELECT'; |
| @@ -378,17 +310,11 @@ | ||
| 378 | 310 | |
| 379 | 311 | if ( $args['value'] ) { |
| 380 | 312 | $query[] = $wpdb->prepare( ' AND meta_value=%s', $args['value'] ); |
| 381 | 313 | } |
| 382 | - | |
| 383 | 314 | $query[] = $order . $limit; |
| 384 | 315 | } |
| 385 | 316 | |
| 386 | - /** | |
| 387 | - * @param int|string $entry_id | |
| 388 | - * | |
| 389 | - * @return array | |
| 390 | - */ | |
| 391 | 317 | public static function get_entry_meta_info( $entry_id ) { |
| 392 | 318 | return FrmDb::get_results( 'frm_item_metas', array( 'item_id' => $entry_id ) ); |
| 393 | 319 | } |
| 394 | 320 | |
| @@ -396,22 +322,19 @@ | ||
| 396 | 322 | * @param array $where |
| 397 | 323 | * @param string $order_by |
| 398 | 324 | * @param string $limit |
| 399 | 325 | * @param bool $stripslashes |
| 400 | - * | |
| 401 | - * @return mixed | |
| 326 | + * @return array | |
| 402 | 327 | */ |
| 403 | 328 | public static function getAll( $where = array(), $order_by = '', $limit = '', $stripslashes = false ) { |
| 404 | 329 | global $wpdb; |
| 405 | - // phpcs:disable Generic.WhiteSpace.ScopeIndent | |
| 406 | 330 | $query = 'SELECT it.*, fi.type as field_type, fi.field_key as field_key, |
| 407 | 331 | fi.required as required, fi.form_id as field_form_id, fi.name as field_name, fi.options as fi_options |
| 408 | 332 | FROM ' . $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id' . |
| 409 | 333 | FrmDb::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit; |
| 410 | - // phpcs:enable Generic.WhiteSpace.ScopeIndent | |
| 411 | 334 | |
| 412 | 335 | $cache_key = 'all_' . FrmAppHelper::maybe_json_encode( $where ) . $order_by . $limit; |
| 413 | - $results = FrmDb::check_cache( $cache_key, 'frm_entry', $query, $limit === ' LIMIT 1' ? 'get_row' : 'get_results' ); | |
| 336 | + $results = FrmDb::check_cache( $cache_key, 'frm_entry', $query, ( $limit == ' LIMIT 1' ? 'get_row' : 'get_results' ) ); | |
| 414 | 337 | |
| 415 | 338 | if ( ! $results || ! $stripslashes ) { |
| 416 | 339 | return $results; |
| 417 | 340 | } |
| @@ -424,17 +347,8 @@ | ||
| 424 | 347 | |
| 425 | 348 | return $results; |
| 426 | 349 | } |
| 427 | 350 | |
| 428 | - /** | |
| 429 | - * @param array|string $where | |
| 430 | - * @param string $order_by | |
| 431 | - * @param string $limit | |
| 432 | - * @param bool $unique | |
| 433 | - * @param array $args | |
| 434 | - * | |
| 435 | - * @return array|string|null | |
| 436 | - */ | |
| 437 | 351 | public static function getEntryIds( $where = array(), $order_by = '', $limit = '', $unique = true, $args = array() ) { |
| 438 | 352 | $defaults = array( |
| 439 | 353 | 'is_draft' => false, |
| 440 | 354 | 'user_id' => '', |
| @@ -440,11 +354,13 @@ | ||
| 440 | 354 | 'user_id' => '', |
| 441 | 355 | 'group_by' => '', |
| 442 | 356 | ); |
| 443 | 357 | $args = wp_parse_args( $args, $defaults ); |
| 444 | - $query = array(); | |
| 358 | + | |
| 359 | + $query = array(); | |
| 445 | 360 | self::get_ids_query( $where, $order_by, $limit, $unique, $args, $query ); |
| 446 | - $query = implode( ' ', $query ); | |
| 361 | + $query = implode( ' ', $query ); | |
| 362 | + | |
| 447 | 363 | $cache_key = 'ids_' . FrmAppHelper::maybe_json_encode( $where ) . $order_by . 'l' . $limit . 'u' . $unique . FrmAppHelper::maybe_json_encode( $args ); |
| 448 | 364 | $type = 'get_' . ( ' LIMIT 1' === $limit ? 'var' : 'col' ); |
| 449 | 365 | return FrmDb::check_cache( $cache_key, 'frm_entry', $query, $type ); |
| 450 | 366 | } |
| @@ -454,9 +370,8 @@ | ||
| 454 | 370 | * If a child entry id is matched, its parent will be returned in its place |
| 455 | 371 | * |
| 456 | 372 | * @param array $query |
| 457 | 373 | * @param array $args |
| 458 | - * | |
| 459 | 374 | * @return array |
| 460 | 375 | */ |
| 461 | 376 | public static function get_top_level_entry_ids( $query, $args ) { |
| 462 | 377 | $args['return_parent_id_if_0_return_id'] = true; |
| @@ -463,54 +378,13 @@ | ||
| 463 | 378 | return self::getEntryIds( $query, '', '', true, $args ); |
| 464 | 379 | } |
| 465 | 380 | |
| 466 | 381 | /** |
| 467 | - * Returns true if the where clause refers to a field table column that is not form_id. It also updates | |
| 468 | - * the where clause to refer to the entry table for form_id if fields table should not be joined. | |
| 469 | - * | |
| 470 | - * @since 6.16.1 | |
| 471 | - * | |
| 472 | 382 | * @param array|string $where |
| 473 | - * | |
| 474 | - * @return bool | |
| 475 | - */ | |
| 476 | - private static function should_join_fields_table( &$where ) { | |
| 477 | - if ( is_string( $where ) ) { | |
| 478 | - if ( preg_match( '/\bfi\.(?!form_id)\w+/i', $where ) ) { | |
| 479 | - return true; | |
| 480 | - } | |
| 481 | - | |
| 482 | - $where = str_ireplace( 'fi.form_id', 'e.form_id', $where ); | |
| 483 | - return false; | |
| 484 | - } | |
| 485 | - | |
| 486 | - $where_fields = array_keys( $where ); | |
| 487 | - | |
| 488 | - foreach ( $where_fields as $where_field ) { | |
| 489 | - if ( str_starts_with( $where_field, 'fi.' ) && 'fi.form_id' !== $where_field ) { | |
| 490 | - return true; | |
| 491 | - } | |
| 492 | - } | |
| 493 | - | |
| 494 | - if ( isset( $where['fi.form_id'] ) ) { | |
| 495 | - $where['e.form_id'] = $where['fi.form_id']; | |
| 496 | - unset( $where['fi.form_id'] ); | |
| 497 | - } | |
| 498 | - | |
| 499 | - return false; | |
| 500 | - } | |
| 501 | - | |
| 502 | - /** | |
| 503 | - * @param array|string $where | |
| 504 | 383 | * @param string $order_by |
| 505 | 384 | * @param string $limit |
| 506 | - * @param bool $unique | |
| 507 | - * @param array $args | |
| 508 | - * @param array $query | |
| 509 | - * | |
| 510 | - * @return void | |
| 511 | 385 | */ |
| 512 | - private static function get_ids_query( $where, $order_by, $limit, $unique, $args, array &$query ) { // phpcs:ignore SlevomatCodingStandard.Complexity.Cognitive.ComplexityTooHigh, SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 386 | + private static function get_ids_query( $where, $order_by, $limit, $unique, $args, array &$query ) { | |
| 513 | 387 | global $wpdb; |
| 514 | 388 | $query[] = 'SELECT'; |
| 515 | 389 | $defaults = array( |
| 516 | 390 | 'return_parent_id' => false, |
| @@ -529,25 +403,23 @@ | ||
| 529 | 403 | } else { |
| 530 | 404 | $query[] = 'it.item_id'; |
| 531 | 405 | } |
| 532 | 406 | |
| 533 | - $from = 'FROM ' . $wpdb->prefix . 'frm_item_metas it'; | |
| 407 | + $query[] = 'FROM ' . $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id'; | |
| 534 | 408 | |
| 535 | - if ( self::should_join_fields_table( $where ) || self::should_join_fields_table( $order_by ) ) { | |
| 536 | - $from .= ' LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id=fi.id'; | |
| 537 | - } | |
| 538 | - | |
| 539 | - $query[] = $from; | |
| 540 | 409 | $query[] = 'INNER JOIN ' . $wpdb->prefix . 'frm_items e ON (e.id=it.item_id)'; |
| 541 | - | |
| 542 | 410 | if ( is_array( $where ) ) { |
| 543 | 411 | if ( ! $args['is_draft'] ) { |
| 544 | 412 | $where['e.is_draft'] = 0; |
| 545 | 413 | } elseif ( is_numeric( $args['is_draft'] ) ) { |
| 546 | - $where['e.is_draft'] = class_exists( 'FrmAbandonmentHooksController', false ) ? absint( $args['is_draft'] ) : 1; | |
| 414 | + if ( class_exists( 'FrmAbandonmentHooksController', false ) ) { | |
| 415 | + $where['e.is_draft'] = absint( $args['is_draft'] ); | |
| 416 | + } else { | |
| 417 | + $where['e.is_draft'] = 1; | |
| 418 | + } | |
| 547 | 419 | } elseif ( 'both' === $args['is_draft'] && class_exists( 'FrmAbandonmentHooksController', false ) ) { |
| 548 | 420 | $where['e.is_draft'] = array( 0, 1 ); |
| 549 | - } elseif ( str_contains( $args['is_draft'], ',' ) ) { | |
| 421 | + } elseif ( false !== strpos( $args['is_draft'], ',' ) ) { | |
| 550 | 422 | $is_draft = array_reduce( |
| 551 | 423 | explode( ',', $args['is_draft'] ), |
| 552 | 424 | function ( $total, $current ) { |
| 553 | 425 | if ( is_numeric( $current ) ) { |
| @@ -556,9 +428,8 @@ | ||
| 556 | 428 | return $total; |
| 557 | 429 | }, |
| 558 | 430 | array() |
| 559 | 431 | ); |
| 560 | - | |
| 561 | 432 | if ( $is_draft ) { |
| 562 | 433 | $where['e.is_draft'] = $is_draft; |
| 563 | 434 | } |
| 564 | 435 | }//end if |
| @@ -565,9 +436,8 @@ | ||
| 565 | 436 | |
| 566 | 437 | if ( ! empty( $args['user_id'] ) ) { |
| 567 | 438 | $where['e.user_id'] = $args['user_id']; |
| 568 | 439 | } |
| 569 | - | |
| 570 | 440 | $query[] = FrmDb::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit; |
| 571 | 441 | |
| 572 | 442 | if ( $args['group_by'] ) { |
| 573 | 443 | $query[] = ' GROUP BY ' . sanitize_text_field( $args['group_by'] ); |
| @@ -577,12 +447,11 @@ | ||
| 577 | 447 | }//end if |
| 578 | 448 | |
| 579 | 449 | $draft_where = ''; |
| 580 | 450 | $user_where = ''; |
| 581 | - | |
| 582 | 451 | if ( ! $args['is_draft'] ) { |
| 583 | 452 | $draft_where = $wpdb->prepare( ' AND e.is_draft=%d', 0 ); |
| 584 | - } elseif ( $args['is_draft'] == 1 ) { // phpcs:ignore Universal.Operators.StrictComparisons | |
| 453 | + } elseif ( $args['is_draft'] == 1 ) { | |
| 585 | 454 | $draft_where = $wpdb->prepare( ' AND e.is_draft=%d', 1 ); |
| 586 | 455 | } |
| 587 | 456 | |
| 588 | 457 | if ( ! empty( $args['user_id'] ) ) { |
| @@ -588,10 +457,10 @@ | ||
| 588 | 457 | if ( ! empty( $args['user_id'] ) ) { |
| 589 | 458 | $user_where = $wpdb->prepare( ' AND e.user_id=%d', $args['user_id'] ); |
| 590 | 459 | } |
| 591 | 460 | |
| 592 | - if ( str_contains( $where, ' GROUP BY ' ) ) { | |
| 593 | - // Don't inject WHERE filtering after GROUP BY | |
| 461 | + if ( strpos( $where, ' GROUP BY ' ) ) { | |
| 462 | + // don't inject WHERE filtering after GROUP BY | |
| 594 | 463 | $parts = explode( ' GROUP BY ', $where ); |
| 595 | 464 | $where = $parts[0]; |
| 596 | 465 | $where .= $draft_where . $user_where; |
| 597 | 466 | $where .= ' GROUP BY ' . $parts[1]; |
| @@ -602,30 +471,20 @@ | ||
| 602 | 471 | // The query has already been prepared |
| 603 | 472 | $query[] = FrmDb::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit; |
| 604 | 473 | } |
| 605 | 474 | |
| 606 | - /** | |
| 607 | - * @param array|string $search | |
| 608 | - * @param int|string $field_id | |
| 609 | - * @param string $operator | |
| 610 | - * | |
| 611 | - * @return array | |
| 612 | - */ | |
| 613 | 475 | public static function search_entry_metas( $search, $field_id, $operator ) { |
| 614 | 476 | $cache_key = 'search_' . FrmAppHelper::maybe_json_encode( $search ) . $field_id . $operator; |
| 615 | 477 | $results = wp_cache_get( $cache_key, 'frm_entry' ); |
| 616 | - | |
| 617 | 478 | if ( false !== $results ) { |
| 618 | 479 | return $results; |
| 619 | 480 | } |
| 620 | 481 | |
| 621 | 482 | global $wpdb; |
| 622 | - | |
| 623 | 483 | if ( is_array( $search ) ) { |
| 624 | 484 | $where = ''; |
| 625 | - | |
| 626 | 485 | foreach ( $search as $field => $value ) { |
| 627 | - if ( $value <= 0 || ! in_array( $field, array( 'year', 'month', 'day' ), true ) ) { | |
| 486 | + if ( $value <= 0 || ! in_array( $field, array( 'year', 'month', 'day' ) ) ) { | |
| 628 | 487 | continue; |
| 629 | 488 | } |
| 630 | 489 | |
| 631 | 490 | switch ( $field ) { |
| @@ -637,12 +496,10 @@ | ||
| 637 | 496 | break; |
| 638 | 497 | case 'day': |
| 639 | 498 | $value = '%' . $value . '%'; |
| 640 | 499 | } |
| 641 | - | |
| 642 | 500 | $where .= $wpdb->prepare( ' meta_value ' . $operator . ' %s and', $value ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared |
| 643 | 501 | } |
| 644 | - | |
| 645 | 502 | $where .= $wpdb->prepare( ' field_id=%d', $field_id ); |
| 646 | 503 | $query = 'SELECT DISTINCT item_id FROM ' . $wpdb->prefix . 'frm_item_metas' . FrmDb::prepend_and_or_where( ' WHERE ', $where ); |
| 647 | 504 | } else { |
| 648 | 505 | if ( $operator === 'LIKE' ) { |
| @@ -647,10 +504,9 @@ | ||
| 647 | 504 | } else { |
| 648 | 505 | if ( $operator === 'LIKE' ) { |
| 649 | 506 | $search = '%' . $search . '%'; |
| 650 | 507 | } |
| 651 | - | |
| 652 | - $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 ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared, WordPress.DB.PreparedSQL.InterpolatedNotPrepared, SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 508 | + $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 ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared, WordPress.DB.PreparedSQL.InterpolatedNotPrepared | |
| 653 | 509 | }//end if |
| 654 | 510 | |
| 655 | 511 | $results = $wpdb->get_col( $query, 0 ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared |
| 656 | 512 | FrmDb::set_cache( $cache_key, $results, 'frm_entry' ); |
