| @@ -45,9 +45,9 @@ | ||
| 45 | 45 | $where .= $wpdb->prepare( " AND $wpdb->stream.user_role = %s", $args['user_role'] ); |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | if ( ! empty( $args['search'] ) ) { |
| 49 | - $field = ! empty( $args['search_field'] ) ? $args['search_field'] : 'summary'; | |
| 49 | + $field = ! empty( $args['search_field'] ) ? $args['search_field'] : 'summary'; | |
| 50 | 50 | |
| 51 | 51 | // Sanitize field |
| 52 | 52 | $allowed_fields = array( 'ID', 'site_id', 'blog_id', 'object_id', 'user_id', 'user_role', 'created', 'summary', 'connector', 'context', 'action', 'ip' ); |
| 53 | 53 | if ( in_array( $field, $allowed_fields, true ) ) { |
| @@ -73,8 +73,13 @@ | ||
| 73 | 73 | |
| 74 | 74 | /** |
| 75 | 75 | * PARSE DATE PARAM FAMILY |
| 76 | 76 | */ |
| 77 | + if ( ! empty( $args['date'] ) ) { | |
| 78 | + $args['date_from'] = $args['date']; | |
| 79 | + $args['date_to'] = $args['date']; | |
| 80 | + } | |
| 81 | + | |
| 77 | 82 | if ( ! empty( $args['date_from'] ) ) { |
| 78 | 83 | $date = get_gmt_from_date( date( 'Y-m-d H:i:s', strtotime( $args['date_from'] . ' 00:00:00' ) ) ); |
| 79 | 84 | $where .= $wpdb->prepare( " AND DATE($wpdb->stream.created) >= %s", $date ); |
| 80 | 85 | } |
| @@ -93,13 +98,8 @@ | ||
| 93 | 98 | $date = get_gmt_from_date( date( 'Y-m-d H:i:s', strtotime( $args['date_before'] ) ) ); |
| 94 | 99 | $where .= $wpdb->prepare( " AND DATE($wpdb->stream.created) < %s", $date ); |
| 95 | 100 | } |
| 96 | 101 | |
| 97 | - if ( ! empty( $args['date'] ) ) { | |
| 98 | - $args['date_from'] = date( 'Y-m-d', strtotime( $args['date'] ) ) . ' 00:00:00'; | |
| 99 | - $args['date_to'] = date( 'Y-m-d', strtotime( $args['date'] ) ) . ' 23:59:59'; | |
| 100 | - } | |
| 101 | - | |
| 102 | 102 | /** |
| 103 | 103 | * PARSE __IN PARAM FAMILY |
| 104 | 104 | */ |
| 105 | 105 | $ins = array(); |
| @@ -233,43 +233,7 @@ | ||
| 233 | 233 | */ |
| 234 | 234 | $result['items'] = $wpdb->get_results( $query ); // @codingStandardsIgnoreLine $query already prepared |
| 235 | 235 | $result['count'] = $result['items'] ? absint( $wpdb->get_var( 'SELECT FOUND_ROWS()' ) ) : 0; |
| 236 | 236 | |
| 237 | - // Add meta to the records, when applicable | |
| 238 | - if ( empty( $fields ) || in_array( 'meta', $fields, true ) ) { | |
| 239 | - $result['items'] = $this->add_record_meta( $result['items'] ); | |
| 240 | - } | |
| 241 | - | |
| 242 | 237 | return $result; |
| 243 | - } | |
| 244 | - | |
| 245 | - /** | |
| 246 | - * Add meta to a set of records | |
| 247 | - * | |
| 248 | - * @param array $records | |
| 249 | - * | |
| 250 | - * @return array | |
| 251 | - */ | |
| 252 | - public function add_record_meta( $records ) { | |
| 253 | - global $wpdb; | |
| 254 | - | |
| 255 | - $record_ids = array_map( 'absint', wp_list_pluck( $records, 'ID' ) ); | |
| 256 | - | |
| 257 | - if ( empty( $record_ids ) ) { | |
| 258 | - return (array) $records; | |
| 259 | - } | |
| 260 | - | |
| 261 | - $sql_meta = sprintf( | |
| 262 | - "SELECT * FROM $wpdb->streammeta WHERE record_id IN ( %s )", | |
| 263 | - implode( ',', $record_ids ) | |
| 264 | - ); | |
| 265 | - | |
| 266 | - $meta = $wpdb->get_results( $sql_meta ); // @codingStandardsIgnoreLine prepare okay | |
| 267 | - $ids_f = array_flip( $record_ids ); | |
| 268 | - | |
| 269 | - foreach ( $meta as $meta_record ) { | |
| 270 | - $records[ $ids_f[ $meta_record->record_id ] ]->meta[ $meta_record->meta_key ] = maybe_unserialize( $meta_record->meta_value ); | |
| 271 | - } | |
| 272 | - | |
| 273 | - return (array) $records; | |
| 274 | 238 | } |
| 275 | 239 | } |
