| @@ -5,67 +5,45 @@ | ||
| 5 | 5 | |
| 6 | 6 | class FrmEntry { |
| 7 | 7 | |
| 8 | 8 | /** |
| 9 | - * @since 6.16.3 | |
| 10 | - * | |
| 11 | - * @var array | |
| 12 | - */ | |
| 13 | - private static $unique_id_match_checks = array(); | |
| 14 | - | |
| 15 | - /** | |
| 16 | 9 | * Create a new entry |
| 17 | 10 | * |
| 18 | 11 | * @param array $values |
| 19 | 12 | * |
| 20 | - * @return bool|int Entry ID. | |
| 13 | + * @return int | boolean $entry_id | |
| 21 | 14 | */ |
| 22 | 15 | public static function create( $values ) { |
| 23 | - return self::create_entry( $values, 'standard' ); | |
| 16 | + $entry_id = self::create_entry( $values, 'standard' ); | |
| 17 | + | |
| 18 | + return $entry_id; | |
| 24 | 19 | } |
| 25 | 20 | |
| 26 | 21 | /** |
| 27 | 22 | * Create a new entry with some differences depending on type |
| 28 | 23 | * |
| 29 | - * @param array $values | |
| 24 | + * @param array $values | |
| 30 | 25 | * @param string $type |
| 31 | 26 | * |
| 32 | - * @return bool|int Entry ID. | |
| 27 | + * @return int | boolean $entry_id | |
| 33 | 28 | */ |
| 34 | 29 | private static function create_entry( $values, $type ) { |
| 35 | 30 | $new_values = self::before_insert_entry_in_database( $values, $type ); |
| 36 | 31 | |
| 37 | 32 | // Don't check XML entries for duplicates |
| 38 | - if ( $type !== 'xml' && self::is_duplicate( $new_values, $values ) ) { | |
| 33 | + if ( $type != 'xml' && self::is_duplicate( $new_values, $values ) ) { | |
| 39 | 34 | return false; |
| 40 | 35 | } |
| 41 | 36 | |
| 42 | - return self::continue_to_create_entry( $values, $new_values ); | |
| 43 | - } | |
| 37 | + $entry_id = self::continue_to_create_entry( $values, $new_values ); | |
| 44 | 38 | |
| 45 | - /** | |
| 46 | - * Flag the memoized unique id check after a new entry is created. | |
| 47 | - * This prevents possibly DB requests and helps avoid issues when creating repeater entries. | |
| 48 | - * | |
| 49 | - * @since 6.16.3 | |
| 50 | - * | |
| 51 | - * @param string $unique_id | |
| 52 | - * | |
| 53 | - * @return void | |
| 54 | - */ | |
| 55 | - private static function flag_new_unique_key( $unique_id ) { | |
| 56 | - if ( ! isset( self::$unique_id_match_checks[ $unique_id ] ) ) { | |
| 57 | - self::$unique_id_match_checks[ $unique_id ] = false; | |
| 58 | - } | |
| 39 | + return $entry_id; | |
| 59 | 40 | } |
| 60 | 41 | |
| 61 | 42 | /** |
| 62 | 43 | * Check for duplicate entries created in the last minute |
| 63 | 44 | * |
| 64 | - * @param array $new_values New values. | |
| 65 | - * @param array $values Values. | |
| 66 | - * | |
| 67 | - * @return bool | |
| 45 | + * @return boolean | |
| 68 | 46 | */ |
| 69 | 47 | public static function is_duplicate( $new_values, $values ) { |
| 70 | 48 | $duplicate_entry_time = apply_filters( 'frm_time_to_check_duplicates', 60, $new_values ); |
| 71 | 49 | |
| @@ -72,18 +50,13 @@ | ||
| 72 | 50 | if ( false === self::is_duplicate_check_needed( $values, $duplicate_entry_time ) ) { |
| 73 | 51 | return false; |
| 74 | 52 | } |
| 75 | 53 | |
| 76 | - if ( self::maybe_check_for_unique_id_match( $values, $new_values['created_at'] ) ) { | |
| 77 | - return true; | |
| 78 | - } | |
| 79 | - | |
| 80 | 54 | $check_val = $new_values; |
| 81 | - $check_val['created_at >'] = gmdate( 'Y-m-d H:i:s', strtotime( $new_values['created_at'] ) - absint( $duplicate_entry_time ) ); | |
| 55 | + $check_val['created_at >'] = gmdate( 'Y-m-d H:i:s', ( strtotime( $new_values['created_at'] ) - absint( $duplicate_entry_time ) ) ); | |
| 82 | 56 | |
| 83 | 57 | unset( $check_val['created_at'], $check_val['updated_at'], $check_val['is_draft'], $check_val['id'], $check_val['item_key'] ); |
| 84 | 58 | |
| 85 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 86 | 59 | if ( $new_values['item_key'] == $new_values['name'] ) { |
| 87 | 60 | unset( $check_val['name'] ); |
| 88 | 61 | } |
| 89 | 62 | |
| @@ -88,34 +61,26 @@ | ||
| 88 | 61 | } |
| 89 | 62 | |
| 90 | 63 | $check_val = apply_filters( 'frm_duplicate_check_val', $check_val ); |
| 91 | 64 | |
| 92 | - if ( ! isset( $values['item_meta'] ) ) { | |
| 93 | - return false; | |
| 94 | - } | |
| 65 | + global $wpdb; | |
| 66 | + $entry_exists = FrmDb::get_col( $wpdb->prefix . 'frm_items', $check_val, 'id', array( 'order_by' => 'created_at DESC' ) ); | |
| 95 | 67 | |
| 96 | - $entry_exists = FrmDb::get_col( 'frm_items', $check_val, 'id', array( 'order_by' => 'created_at DESC' ) ); | |
| 97 | - | |
| 98 | - if ( ! $entry_exists ) { | |
| 68 | + if ( ! $entry_exists || ! isset( $values['item_meta'] ) ) { | |
| 99 | 69 | return false; |
| 100 | 70 | } |
| 101 | 71 | |
| 102 | 72 | global $frm_vars; |
| 103 | 73 | $frm_vars['checking_duplicates'] = true; |
| 104 | - $is_duplicate = false; | |
| 105 | 74 | |
| 75 | + $is_duplicate = false; | |
| 106 | 76 | foreach ( $entry_exists as $entry_exist ) { |
| 107 | 77 | $is_duplicate = true; |
| 108 | 78 | |
| 109 | - // Make sure it's a duplicate | |
| 79 | + // make sure it's a duplicate | |
| 110 | 80 | $metas = FrmEntryMeta::get_entry_meta_info( $entry_exist ); |
| 111 | 81 | $field_metas = array(); |
| 112 | - | |
| 113 | 82 | foreach ( $metas as $meta ) { |
| 114 | - if ( 0 === (int) $meta->field_id ) { | |
| 115 | - continue; | |
| 116 | - } | |
| 117 | - | |
| 118 | 83 | $field_metas[ $meta->field_id ] = $meta->meta_value; |
| 119 | 84 | } |
| 120 | 85 | |
| 121 | 86 | $filtered_vals = array_filter( $values['item_meta'] ); |
| @@ -122,13 +87,13 @@ | ||
| 122 | 87 | $filtered_vals = self::convert_values_to_their_saved_value( $filtered_vals, $entry_exist ); |
| 123 | 88 | $field_metas = array_filter( $field_metas ); |
| 124 | 89 | |
| 125 | 90 | // If prev entry is empty and current entry is not, they are not duplicates |
| 126 | - if ( ! $field_metas && $filtered_vals ) { | |
| 91 | + if ( empty( $field_metas ) && ! empty( $filtered_vals ) ) { | |
| 127 | 92 | return false; |
| 128 | 93 | } |
| 129 | 94 | |
| 130 | - // Compare serialized values and not arrays | |
| 95 | + // compare serialized values and not arrays | |
| 131 | 96 | $new_meta = array_map( 'maybe_serialize', $filtered_vals ); |
| 132 | 97 | |
| 133 | 98 | if ( $field_metas === $new_meta ) { |
| 134 | 99 | $is_duplicate = true; |
| @@ -141,12 +106,12 @@ | ||
| 141 | 106 | continue; |
| 142 | 107 | } |
| 143 | 108 | |
| 144 | 109 | $diff = array_diff_assoc( $field_metas, $new_meta ); |
| 145 | - | |
| 146 | - foreach ( $diff as $meta_value ) { | |
| 147 | - if ( $meta_value ) { | |
| 110 | + foreach ( $diff as $field_id => $meta_value ) { | |
| 111 | + if ( ! empty( $meta_value ) ) { | |
| 148 | 112 | $is_duplicate = false; |
| 113 | + continue; | |
| 149 | 114 | } |
| 150 | 115 | } |
| 151 | 116 | |
| 152 | 117 | if ( $is_duplicate ) { |
| @@ -151,9 +116,9 @@ | ||
| 151 | 116 | |
| 152 | 117 | if ( $is_duplicate ) { |
| 153 | 118 | break; |
| 154 | 119 | } |
| 155 | - }//end foreach | |
| 120 | + } | |
| 156 | 121 | |
| 157 | 122 | $frm_vars['checking_duplicates'] = false; |
| 158 | 123 | |
| 159 | 124 | return $is_duplicate; |
| @@ -159,95 +124,25 @@ | ||
| 159 | 124 | return $is_duplicate; |
| 160 | 125 | } |
| 161 | 126 | |
| 162 | 127 | /** |
| 163 | - * @since 6.16.3 | |
| 164 | - * | |
| 165 | - * @param array $values POST request data. | |
| 166 | - * @param string $created_at The timestamp of the entry we are checking for. | |
| 167 | - * | |
| 168 | - * @return bool | |
| 169 | - */ | |
| 170 | - private static function maybe_check_for_unique_id_match( $values, $created_at ) { | |
| 171 | - if ( ! self::should_check_for_unique_id_match() ) { | |
| 172 | - return false; | |
| 173 | - } | |
| 174 | - | |
| 175 | - if ( empty( $values['unique_id'] ) ) { | |
| 176 | - return false; | |
| 177 | - } | |
| 178 | - | |
| 179 | - $unique_id = sanitize_key( $values['unique_id'] ); | |
| 180 | - | |
| 181 | - if ( ! $unique_id ) { | |
| 182 | - // Only continue if a unique ID was generated on form submit. | |
| 183 | - return false; | |
| 184 | - } | |
| 185 | - | |
| 186 | - if ( isset( self::$unique_id_match_checks[ $unique_id ] ) ) { | |
| 187 | - return self::$unique_id_match_checks[ $unique_id ]; | |
| 188 | - } | |
| 189 | - | |
| 190 | - $timestamp = strtotime( $created_at ); | |
| 191 | - | |
| 192 | - if ( false === $timestamp ) { | |
| 193 | - $timestamp = time(); | |
| 194 | - } | |
| 195 | - | |
| 196 | - self::$unique_id_match_checks[ $unique_id ] = (bool) FrmDb::get_var( | |
| 197 | - 'frm_item_metas', | |
| 198 | - array( | |
| 199 | - 'field_id' => 0, | |
| 200 | - 'meta_value' => serialize( compact( 'unique_id' ) ), | |
| 201 | - 'created_at >' => gmdate( 'Y-m-d H:i:s', $timestamp - MONTH_IN_SECONDS ), | |
| 202 | - ), | |
| 203 | - 'id' | |
| 204 | - ); | |
| 205 | - | |
| 206 | - return self::$unique_id_match_checks[ $unique_id ]; | |
| 207 | - } | |
| 208 | - | |
| 209 | - /** | |
| 210 | - * @since 6.16.3 | |
| 211 | - * | |
| 212 | - * @return bool | |
| 213 | - */ | |
| 214 | - private static function should_check_for_unique_id_match() { | |
| 215 | - /** | |
| 216 | - * Allow users to opt out of the DB query, in case it causes performance issues. | |
| 217 | - * | |
| 218 | - * @since 6.16.3 | |
| 219 | - * | |
| 220 | - * @param bool $should_extend | |
| 221 | - */ | |
| 222 | - $should_check = apply_filters( 'frm_check_for_unique_id_match', true ); | |
| 223 | - return (bool) $should_check; | |
| 224 | - } | |
| 225 | - | |
| 226 | - /** | |
| 227 | 128 | * Convert form data to the actual value that would be saved into the database. |
| 129 | + * This is important for the duplicate check as something like 'a:2:{s:5:"typed";s:0:"";s:6:"output";s:0:"";}' (a signature value) is actually an empty string and does not get saved. | |
| 228 | 130 | * |
| 229 | - * This is important for the duplicate check as something like 'a:2:{s:5:"typed";s:0:"";s:6:"output";s:0:"";}' | |
| 230 | - * (a signature value) is actually an empty string and does not get saved. | |
| 231 | - * | |
| 232 | 131 | * @param array $filter_vals |
| 233 | 132 | * @param int $entry_id |
| 234 | - * | |
| 235 | 133 | * @return array |
| 236 | 134 | */ |
| 237 | 135 | private static function convert_values_to_their_saved_value( $filter_vals, $entry_id ) { |
| 238 | 136 | $reduced = array(); |
| 239 | - | |
| 240 | 137 | foreach ( $filter_vals as $field_id => $value ) { |
| 241 | 138 | $field = FrmFieldFactory::get_field_object( $field_id ); |
| 242 | 139 | $reduced[ $field_id ] = $field->get_value_to_save( $value, array( 'entry_id' => $entry_id ) ); |
| 243 | 140 | $reduced[ $field_id ] = $field->set_value_before_save( $reduced[ $field_id ] ); |
| 244 | - | |
| 245 | - if ( '' === $reduced[ $field_id ] || array() === $reduced[ $field_id ] ) { | |
| 141 | + if ( '' === $reduced[ $field_id ] || ( is_array( $reduced[ $field_id ] ) && 0 === count( $reduced[ $field_id ] ) ) ) { | |
| 246 | 142 | unset( $reduced[ $field_id ] ); |
| 247 | 143 | } |
| 248 | 144 | } |
| 249 | - | |
| 250 | 145 | return $reduced; |
| 251 | 146 | } |
| 252 | 147 | |
| 253 | 148 | /** |
| @@ -255,15 +150,15 @@ | ||
| 255 | 150 | * |
| 256 | 151 | * @since 2.0.23 |
| 257 | 152 | * |
| 258 | 153 | * @param array $values |
| 259 | - * @param int $duplicate_entry_time | |
| 154 | + * @param int $duplicate_entry_time | |
| 260 | 155 | * |
| 261 | 156 | * @return bool |
| 262 | 157 | */ |
| 263 | 158 | private static function is_duplicate_check_needed( $values, $duplicate_entry_time ) { |
| 264 | 159 | // If time for checking duplicates is set to an empty value, don't check for duplicates |
| 265 | - if ( ! $duplicate_entry_time ) { | |
| 160 | + if ( empty( $duplicate_entry_time ) ) { | |
| 266 | 161 | return false; |
| 267 | 162 | } |
| 268 | 163 | |
| 269 | 164 | // If CSV is importing, don't check for duplicates |
| @@ -271,20 +166,20 @@ | ||
| 271 | 166 | return false; |
| 272 | 167 | } |
| 273 | 168 | |
| 274 | 169 | // If repeating field entries are getting created, don't check for duplicates |
| 275 | - return empty( $values['parent_form_id'] ); | |
| 170 | + if ( isset( $values['parent_form_id'] ) && $values['parent_form_id'] ) { | |
| 171 | + return false; | |
| 172 | + } | |
| 173 | + | |
| 174 | + return true; | |
| 276 | 175 | } |
| 277 | 176 | |
| 278 | - /** | |
| 279 | - * @param int|string $id | |
| 280 | - * | |
| 281 | - * @return false|int | |
| 282 | - */ | |
| 283 | 177 | public static function duplicate( $id ) { |
| 284 | 178 | global $wpdb; |
| 285 | 179 | |
| 286 | - $values = self::getOne( $id ); | |
| 180 | + $values = self::getOne( $id ); | |
| 181 | + | |
| 287 | 182 | $new_values = array(); |
| 288 | 183 | $new_values['item_key'] = FrmAppHelper::get_unique_key( '', $wpdb->prefix . 'frm_items', 'item_key' ); |
| 289 | 184 | $new_values['name'] = $values->name; |
| 290 | 185 | $new_values['is_draft'] = $values->is_draft; |
| @@ -294,9 +189,8 @@ | ||
| 294 | 189 | $new_values['created_at'] = current_time( 'mysql', 1 ); |
| 295 | 190 | $new_values['updated_at'] = $new_values['created_at']; |
| 296 | 191 | |
| 297 | 192 | $query_results = $wpdb->insert( $wpdb->prefix . 'frm_items', $new_values ); |
| 298 | - | |
| 299 | 193 | if ( ! $query_results ) { |
| 300 | 194 | return false; |
| 301 | 195 | } |
| 302 | 196 | |
| @@ -302,9 +196,8 @@ | ||
| 302 | 196 | |
| 303 | 197 | $entry_id = $wpdb->insert_id; |
| 304 | 198 | |
| 305 | 199 | global $frm_vars; |
| 306 | - | |
| 307 | 200 | if ( ! isset( $frm_vars['saved_entries'] ) ) { |
| 308 | 201 | $frm_vars['saved_entries'] = array(); |
| 309 | 202 | } |
| 310 | 203 | $frm_vars['saved_entries'][] = (int) $entry_id; |
| @@ -319,15 +212,17 @@ | ||
| 319 | 212 | |
| 320 | 213 | /** |
| 321 | 214 | * Update an entry (not via XML) |
| 322 | 215 | * |
| 323 | - * @param int $id | |
| 216 | + * @param int $id | |
| 324 | 217 | * @param array $values |
| 325 | 218 | * |
| 326 | - * @return bool|int Update results. | |
| 219 | + * @return boolean|int $update_results | |
| 327 | 220 | */ |
| 328 | 221 | public static function update( $id, $values ) { |
| 329 | - return self::update_entry( $id, $values, 'standard' ); | |
| 222 | + $update_results = self::update_entry( $id, $values, 'standard' ); | |
| 223 | + | |
| 224 | + return $update_results; | |
| 330 | 225 | } |
| 331 | 226 | |
| 332 | 227 | /** |
| 333 | 228 | * Update an entry with some differences depending on the update type |
| @@ -333,24 +228,23 @@ | ||
| 333 | 228 | * Update an entry with some differences depending on the update type |
| 334 | 229 | * |
| 335 | 230 | * @since 2.0.16 |
| 336 | 231 | * |
| 337 | - * @param int $id | |
| 338 | - * @param array $values | |
| 339 | - * @param string $update_type | |
| 232 | + * @param int $id | |
| 233 | + * @param array $values | |
| 340 | 234 | * |
| 341 | - * @return bool|int Query results. | |
| 235 | + * @return boolean|int $query_results | |
| 342 | 236 | */ |
| 343 | 237 | private static function update_entry( $id, $values, $update_type ) { |
| 344 | 238 | global $wpdb; |
| 345 | 239 | |
| 346 | 240 | $update = self::before_update_entry( $id, $values, $update_type ); |
| 347 | - | |
| 348 | 241 | if ( ! $update ) { |
| 349 | 242 | return false; |
| 350 | 243 | } |
| 351 | 244 | |
| 352 | - $new_values = self::package_entry_to_update( $id, $values ); | |
| 245 | + $new_values = self::package_entry_to_update( $id, $values ); | |
| 246 | + | |
| 353 | 247 | $query_results = $wpdb->update( $wpdb->prefix . 'frm_items', $new_values, compact( 'id' ) ); |
| 354 | 248 | |
| 355 | 249 | self::after_update_entry( $query_results, $id, $values, $new_values ); |
| 356 | 250 | |
| @@ -359,10 +253,9 @@ | ||
| 359 | 253 | |
| 360 | 254 | /** |
| 361 | 255 | * Delete an entry. |
| 362 | 256 | * |
| 363 | - * @param int|string $id | |
| 364 | - * | |
| 257 | + * @param string|int $id | |
| 365 | 258 | * @return bool True on success, false if nothing was deleted. |
| 366 | 259 | */ |
| 367 | 260 | public static function destroy( $id ) { |
| 368 | 261 | global $wpdb; |
| @@ -367,13 +260,12 @@ | ||
| 367 | 260 | public static function destroy( $id ) { |
| 368 | 261 | global $wpdb; |
| 369 | 262 | $id = (int) $id; |
| 370 | 263 | |
| 371 | - // Item meta is required for conditional logic in actions with 'delete' events. | |
| 372 | - $entry = self::getOne( $id, true ); | |
| 373 | - | |
| 264 | + $entry = self::getOne( $id, true ); // Item meta is required for conditional logic in actions with 'delete' events. | |
| 374 | 265 | if ( ! $entry ) { |
| 375 | - return false; | |
| 266 | + $result = false; | |
| 267 | + return $result; | |
| 376 | 268 | } |
| 377 | 269 | |
| 378 | 270 | /** |
| 379 | 271 | * Trigger an action to run custom logic before the entry is deleted. |
| @@ -401,20 +293,12 @@ | ||
| 401 | 293 | |
| 402 | 294 | return $result; |
| 403 | 295 | } |
| 404 | 296 | |
| 405 | - /** | |
| 406 | - * @param int $id | |
| 407 | - * @param mixed $value | |
| 408 | - * @param int|string $form_id | |
| 409 | - * | |
| 410 | - * @return false|int | |
| 411 | - */ | |
| 412 | 297 | public static function update_form( $id, $value, $form_id ) { |
| 413 | 298 | global $wpdb; |
| 414 | 299 | $form_id = isset( $value ) ? $form_id : null; |
| 415 | 300 | $result = $wpdb->update( $wpdb->prefix . 'frm_items', array( 'form_id' => $form_id ), array( 'id' => $id ) ); |
| 416 | - | |
| 417 | 301 | if ( $result ) { |
| 418 | 302 | self::clear_cache(); |
| 419 | 303 | } |
| 420 | 304 | |
| @@ -425,10 +309,8 @@ | ||
| 425 | 309 | * Clear entry caching |
| 426 | 310 | * Called when an entry is changed |
| 427 | 311 | * |
| 428 | 312 | * @since 2.0.5 |
| 429 | - * | |
| 430 | - * @return void | |
| 431 | 313 | */ |
| 432 | 314 | public static function clear_cache() { |
| 433 | 315 | FrmDb::cache_delete_group( 'frm_entry' ); |
| 434 | 316 | FrmDb::cache_delete_group( 'frm_item' ); |
| @@ -440,42 +322,33 @@ | ||
| 440 | 322 | * After switching to the wp_loaded hook for processing entries, |
| 441 | 323 | * we can no longer use 'name', but check it as a fallback |
| 442 | 324 | * |
| 443 | 325 | * @since 2.0.11 |
| 444 | - * | |
| 445 | - * @param array $values | |
| 446 | - * @param array|string $default | |
| 447 | - * | |
| 448 | - * @return string | |
| 449 | 326 | */ |
| 450 | 327 | public static function get_new_entry_name( $values, $default = '' ) { |
| 451 | - $name = $values['item_name'] ?? $values['name'] ?? $default; | |
| 452 | - return is_array( $name ) ? reset( $name ) : $name; | |
| 328 | + $name = isset( $values['item_name'] ) ? $values['item_name'] : ( isset( $values['name'] ) ? $values['name'] : $default ); | |
| 329 | + if ( is_array( $name ) ) { | |
| 330 | + $name = reset( $name ); | |
| 331 | + } | |
| 332 | + | |
| 333 | + return $name; | |
| 453 | 334 | } |
| 454 | 335 | |
| 455 | 336 | /** |
| 456 | 337 | * If $entry is numeric, get the entry object |
| 457 | 338 | * |
| 339 | + * @param int|object $entry by reference | |
| 340 | + * | |
| 458 | 341 | * @since 2.0.9 |
| 459 | - * | |
| 460 | - * @param int|object|string $entry By reference. | |
| 461 | - * | |
| 462 | - * @return void | |
| 463 | 342 | */ |
| 464 | 343 | public static function maybe_get_entry( &$entry ) { |
| 465 | 344 | if ( $entry && is_numeric( $entry ) ) { |
| 466 | 345 | $entry = self::getOne( $entry ); |
| 467 | - } elseif ( ! $entry || 'false' === $entry ) { | |
| 346 | + } elseif ( empty( $entry ) || 'false' === $entry ) { | |
| 468 | 347 | $entry = false; |
| 469 | 348 | } |
| 470 | 349 | } |
| 471 | 350 | |
| 472 | - /** | |
| 473 | - * @param int|string $id | |
| 474 | - * @param bool $meta | |
| 475 | - * | |
| 476 | - * @return object|null | |
| 477 | - */ | |
| 478 | 351 | public static function getOne( $id, $meta = false ) { |
| 479 | 352 | global $wpdb; |
| 480 | 353 | |
| 481 | 354 | $query = "SELECT it.*, fr.name as form_name, fr.form_key as form_key FROM {$wpdb->prefix}frm_items it |
| @@ -480,9 +353,9 @@ | ||
| 480 | 353 | |
| 481 | 354 | $query = "SELECT it.*, fr.name as form_name, fr.form_key as form_key FROM {$wpdb->prefix}frm_items it |
| 482 | 355 | LEFT OUTER JOIN {$wpdb->prefix}frm_forms fr ON it.form_id=fr.id WHERE "; |
| 483 | 356 | |
| 484 | - $query .= is_numeric( $id ) ? 'it.id=%d' : 'it.item_key=%s'; | |
| 357 | + $query .= is_numeric( $id ) ? 'it.id=%d' : 'it.item_key=%s'; | |
| 485 | 358 | $query_args = array( $id ); |
| 486 | 359 | $query = $wpdb->prepare( $query, $query_args ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared |
| 487 | 360 | |
| 488 | 361 | if ( ! $meta ) { |
| @@ -491,9 +364,8 @@ | ||
| 491 | 364 | return $entry; |
| 492 | 365 | } |
| 493 | 366 | |
| 494 | 367 | $entry = FrmDb::check_cache( $id, 'frm_entry' ); |
| 495 | - | |
| 496 | 368 | if ( $entry !== false ) { |
| 497 | 369 | self::prepare_entry( $entry ); |
| 498 | 370 | return $entry; |
| 499 | 371 | } |
| @@ -508,19 +380,16 @@ | ||
| 508 | 380 | /** |
| 509 | 381 | * @since 4.02.03 |
| 510 | 382 | * |
| 511 | 383 | * @param object $entry |
| 512 | - * | |
| 513 | - * @return void | |
| 514 | 384 | */ |
| 515 | 385 | private static function prepare_entry( &$entry ) { |
| 516 | - if ( ! $entry ) { | |
| 386 | + if ( empty( $entry ) ) { | |
| 517 | 387 | return; |
| 518 | 388 | } |
| 519 | 389 | |
| 520 | 390 | FrmAppHelper::unserialize_or_decode( $entry->description ); |
| 521 | - // TODO: Remove slashes on input only, not output. | |
| 522 | - $entry = wp_unslash( $entry ); | |
| 391 | + $entry = wp_unslash( $entry ); // TODO: Remove slashes on input only, not output. | |
| 523 | 392 | } |
| 524 | 393 | |
| 525 | 394 | /** |
| 526 | 395 | * @since 4.02.03 |
| @@ -525,10 +394,8 @@ | ||
| 525 | 394 | /** |
| 526 | 395 | * @since 4.02.03 |
| 527 | 396 | * |
| 528 | 397 | * @param array $entries |
| 529 | - * | |
| 530 | - * @return void | |
| 531 | 398 | */ |
| 532 | 399 | private static function prepare_entries( &$entries ) { |
| 533 | 400 | foreach ( $entries as $k => $entry ) { |
| 534 | 401 | self::prepare_entry( $entry ); |
| @@ -535,13 +402,8 @@ | ||
| 535 | 402 | $entries[ $k ] = $entry; |
| 536 | 403 | } |
| 537 | 404 | } |
| 538 | 405 | |
| 539 | - /** | |
| 540 | - * @param object|null $entry | |
| 541 | - * | |
| 542 | - * @return object|null | |
| 543 | - */ | |
| 544 | 406 | public static function get_meta( $entry ) { |
| 545 | 407 | if ( ! $entry ) { |
| 546 | 408 | return $entry; |
| 547 | 409 | } |
| @@ -552,21 +414,18 @@ | ||
| 552 | 414 | array( |
| 553 | 415 | 'item_id' => $entry->id, |
| 554 | 416 | 'field_id !' => 0, |
| 555 | 417 | ), |
| 556 | - 'field_id, meta_value, field_key, item_id, f.type' | |
| 418 | + 'field_id, meta_value, field_key, item_id' | |
| 557 | 419 | ); |
| 558 | 420 | |
| 559 | 421 | $entry->metas = array(); |
| 560 | 422 | |
| 561 | 423 | $include_key = apply_filters( 'frm_include_meta_keys', false, array( 'form_id' => $entry->form_id ) ); |
| 562 | - | |
| 563 | 424 | foreach ( $metas as $meta_val ) { |
| 564 | - FrmFieldsHelper::prepare_field_value( $meta_val->meta_value, $meta_val->type ); | |
| 565 | - | |
| 566 | - if ( (int) $meta_val->item_id === (int) $entry->id ) { | |
| 425 | + if ( $meta_val->item_id == $entry->id ) { | |
| 426 | + FrmAppHelper::unserialize_or_decode( $meta_val->meta_value ); | |
| 567 | 427 | $entry->metas[ $meta_val->field_id ] = $meta_val->meta_value; |
| 568 | - | |
| 569 | 428 | if ( $include_key ) { |
| 570 | 429 | $entry->metas[ $meta_val->field_key ] = $entry->metas[ $meta_val->field_id ]; |
| 571 | 430 | } |
| 572 | 431 | continue; |
| @@ -571,17 +430,18 @@ | ||
| 571 | 430 | } |
| 572 | 431 | continue; |
| 573 | 432 | } |
| 574 | 433 | |
| 575 | - // Include sub entries in an array | |
| 434 | + // include sub entries in an array | |
| 576 | 435 | if ( ! isset( $entry->metas[ $meta_val->field_id ] ) ) { |
| 577 | 436 | $entry->metas[ $meta_val->field_id ] = array(); |
| 578 | 437 | } |
| 579 | 438 | |
| 439 | + FrmAppHelper::unserialize_or_decode( $meta_val->meta_value ); | |
| 580 | 440 | $entry->metas[ $meta_val->field_id ][] = $meta_val->meta_value; |
| 581 | 441 | |
| 582 | 442 | unset( $meta_val ); |
| 583 | - }//end foreach | |
| 443 | + } | |
| 584 | 444 | unset( $metas ); |
| 585 | 445 | |
| 586 | 446 | FrmDb::set_cache( $entry->id, $entry, 'frm_entry' ); |
| 587 | 447 | |
| @@ -589,45 +449,43 @@ | ||
| 589 | 449 | } |
| 590 | 450 | |
| 591 | 451 | /** |
| 592 | 452 | * @param string $id |
| 593 | - * | |
| 594 | - * @return bool | |
| 595 | 453 | */ |
| 596 | 454 | public static function exists( $id ) { |
| 455 | + global $wpdb; | |
| 456 | + | |
| 597 | 457 | if ( FrmDb::check_cache( $id, 'frm_entry' ) ) { |
| 598 | - return true; | |
| 458 | + $exists = true; | |
| 459 | + | |
| 460 | + return $exists; | |
| 599 | 461 | } |
| 600 | 462 | |
| 601 | - $where = is_numeric( $id ) ? array( 'id' => $id ) : array( 'item_key' => $id ); | |
| 602 | - $id = FrmDb::get_var( 'frm_items', $where ); | |
| 463 | + if ( is_numeric( $id ) ) { | |
| 464 | + $where = array( 'id' => $id ); | |
| 465 | + } else { | |
| 466 | + $where = array( 'item_key' => $id ); | |
| 467 | + } | |
| 468 | + $id = FrmDb::get_var( $wpdb->prefix . 'frm_items', $where ); | |
| 603 | 469 | |
| 604 | - return $id && $id > 0; | |
| 470 | + return ( $id && $id > 0 ); | |
| 605 | 471 | } |
| 606 | 472 | |
| 607 | - /** | |
| 608 | - * @param array|string $where | |
| 609 | - * @param string $order_by | |
| 610 | - * @param string $limit | |
| 611 | - * @param bool $meta | |
| 612 | - * @param bool $inc_form | |
| 613 | - * | |
| 614 | - * @return array | |
| 615 | - */ | |
| 616 | 473 | public static function getAll( $where, $order_by = '', $limit = '', $meta = false, $inc_form = true ) { |
| 617 | 474 | global $wpdb; |
| 618 | 475 | |
| 619 | - $limit = FrmDb::esc_limit( $limit ); | |
| 476 | + $limit = FrmDb::esc_limit( $limit ); | |
| 477 | + | |
| 620 | 478 | $cache_key = FrmAppHelper::maybe_json_encode( $where ) . $order_by . $limit . $inc_form; |
| 621 | 479 | $entries = wp_cache_get( $cache_key, 'frm_entry' ); |
| 622 | 480 | |
| 623 | 481 | if ( false === $entries ) { |
| 624 | - $fields = 'it.id, it.item_key, it.name, it.ip, it.form_id, it.post_id, it.user_id, it.parent_item_id, it.updated_by, it.created_at, it.updated_at, it.is_draft, it.description'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong | |
| 482 | + $fields = 'it.id, it.item_key, it.name, it.ip, it.form_id, it.post_id, it.user_id, it.parent_item_id, it.updated_by, it.created_at, it.updated_at, it.is_draft, it.description'; | |
| 625 | 483 | $table = $wpdb->prefix . 'frm_items it '; |
| 626 | 484 | |
| 627 | 485 | if ( $inc_form ) { |
| 628 | 486 | $fields = 'it.*, fr.name as form_name,fr.form_key as form_key'; |
| 629 | - $table .= 'LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fr ON it.form_id=fr.id '; | |
| 487 | + $table .= 'LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fr ON it.form_id=fr.id '; | |
| 630 | 488 | } |
| 631 | 489 | |
| 632 | 490 | if ( preg_match( '/ meta_([0-9]+)/', $order_by, $order_matches ) ) { |
| 633 | 491 | $fields .= self::sort_by_field( $order_matches[1] ); |
| @@ -633,9 +491,9 @@ | ||
| 633 | 491 | $fields .= self::sort_by_field( $order_matches[1] ); |
| 634 | 492 | unset( $order_matches ); |
| 635 | 493 | } |
| 636 | 494 | |
| 637 | - // Prepare the query | |
| 495 | + // prepare the query | |
| 638 | 496 | $query = 'SELECT ' . $fields . ' FROM ' . $table . FrmDb::prepend_and_or_where( ' WHERE ', $where ) . $order_by . $limit; |
| 639 | 497 | |
| 640 | 498 | $entries = $wpdb->get_results( $query, OBJECT_K ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared |
| 641 | 499 | unset( $query ); |
| @@ -640,9 +498,9 @@ | ||
| 640 | 498 | $entries = $wpdb->get_results( $query, OBJECT_K ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared |
| 641 | 499 | unset( $query ); |
| 642 | 500 | |
| 643 | 501 | FrmDb::set_cache( $cache_key, $entries, 'frm_entry' ); |
| 644 | - }//end if | |
| 502 | + } | |
| 645 | 503 | |
| 646 | 504 | if ( ! $meta || ! $entries ) { |
| 647 | 505 | self::prepare_entries( $entries ); |
| 648 | 506 | return $entries; |
| @@ -653,21 +511,15 @@ | ||
| 653 | 511 | $where = array( 'it.form_id' => substr( $where, 11 ) ); |
| 654 | 512 | } |
| 655 | 513 | |
| 656 | 514 | $meta_where = array( 'field_id !' => 0 ); |
| 657 | - | |
| 658 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 659 | - if ( $limit == '' && is_array( $where ) && count( $where ) === 1 && isset( $where['it.form_id'] ) ) { | |
| 515 | + if ( $limit == '' && is_array( $where ) && count( $where ) == 1 && isset( $where['it.form_id'] ) ) { | |
| 660 | 516 | $meta_where['fi.form_id'] = $where['it.form_id']; |
| 661 | 517 | } else { |
| 662 | 518 | $meta_where['item_id'] = array_keys( $entries ); |
| 663 | 519 | } |
| 664 | 520 | |
| 665 | - $metas = FrmDb::get_results( | |
| 666 | - $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON it.field_id = fi.id', | |
| 667 | - $meta_where, | |
| 668 | - 'item_id, meta_value, field_id, field_key, form_id, fi.type' | |
| 669 | - ); | |
| 521 | + $metas = FrmDb::get_results( $wpdb->prefix . 'frm_item_metas it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_fields fi ON (it.field_id = fi.id)', $meta_where, 'item_id, meta_value, field_id, field_key, form_id' ); | |
| 670 | 522 | |
| 671 | 523 | unset( $meta_where ); |
| 672 | 524 | |
| 673 | 525 | if ( ! $metas ) { |
| @@ -683,9 +535,9 @@ | ||
| 683 | 535 | if ( ! isset( $entries[ $meta_val->item_id ]->metas ) ) { |
| 684 | 536 | $entries[ $meta_val->item_id ]->metas = array(); |
| 685 | 537 | } |
| 686 | 538 | |
| 687 | - FrmFieldsHelper::prepare_field_value( $meta_val->meta_value, $meta_val->type ); | |
| 539 | + FrmAppHelper::unserialize_or_decode( $meta_val->meta_value ); | |
| 688 | 540 | $entries[ $meta_val->item_id ]->metas[ $meta_val->field_id ] = $meta_val->meta_value; |
| 689 | 541 | unset( $m_key, $meta_val ); |
| 690 | 542 | } |
| 691 | 543 | |
| @@ -700,15 +552,15 @@ | ||
| 700 | 552 | return $entries; |
| 701 | 553 | } |
| 702 | 554 | |
| 703 | 555 | /** |
| 704 | - * @param int|string $field_id | |
| 705 | - * | |
| 556 | + * @param int $field_id | |
| 706 | 557 | * @return string |
| 707 | 558 | */ |
| 708 | 559 | private static function sort_by_field( $field_id ) { |
| 709 | 560 | global $wpdb; |
| 710 | - $field_id = (int) $field_id; | |
| 561 | + $field_id = (int) $field_id; | |
| 562 | + | |
| 711 | 563 | $field_options = FrmDb::get_var( 'frm_fields', array( 'id' => $field_id ), 'field_options' ); |
| 712 | 564 | FrmAppHelper::unserialize_or_decode( $field_options ); |
| 713 | 565 | |
| 714 | 566 | if ( empty( $field_options['post_field'] ) ) { |
| @@ -721,15 +573,13 @@ | ||
| 721 | 573 | } |
| 722 | 574 | |
| 723 | 575 | // Pagination Methods |
| 724 | 576 | /** |
| 725 | - * @param array|int|string $where If int, use the form id. | |
| 726 | - * | |
| 727 | - * @return int|string | |
| 577 | + * @param int|array|string If int, use the form id. | |
| 728 | 578 | */ |
| 729 | 579 | public static function getRecordCount( $where = '' ) { |
| 730 | 580 | global $wpdb; |
| 731 | - $table_join = $wpdb->prefix . 'frm_items it JOIN ' . $wpdb->prefix . 'frm_forms fr ON it.form_id=fr.id'; | |
| 581 | + $table_join = $wpdb->prefix . 'frm_items it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fr ON it.form_id=fr.id'; | |
| 732 | 582 | |
| 733 | 583 | if ( is_numeric( $where ) ) { |
| 734 | 584 | $table_join = 'frm_items'; |
| 735 | 585 | $where = array( 'form_id' => $where ); |
| @@ -735,35 +585,29 @@ | ||
| 735 | 585 | $where = array( 'form_id' => $where ); |
| 736 | 586 | } |
| 737 | 587 | |
| 738 | 588 | if ( is_array( $where ) ) { |
| 739 | - return FrmDb::get_count( $table_join, $where ); | |
| 589 | + $count = FrmDb::get_count( $table_join, $where ); | |
| 590 | + } else { | |
| 591 | + $cache_key = 'count_' . FrmAppHelper::maybe_json_encode( $where ); | |
| 592 | + $query = 'SELECT COUNT(*) FROM ' . $table_join . FrmDb::prepend_and_or_where( ' WHERE ', $where ); | |
| 593 | + $count = FrmDb::check_cache( $cache_key, 'frm_entry', $query, 'get_var' ); | |
| 740 | 594 | } |
| 741 | 595 | |
| 742 | - $cache_key = 'count_' . FrmAppHelper::maybe_json_encode( $where ); | |
| 743 | - $query = 'SELECT COUNT(*) FROM ' . $table_join . FrmDb::prepend_and_or_where( ' WHERE ', $where ); | |
| 744 | - | |
| 745 | - return FrmDb::check_cache( $cache_key, 'frm_entry', $query, 'get_var' ); | |
| 596 | + return $count; | |
| 746 | 597 | } |
| 747 | 598 | |
| 748 | - /** | |
| 749 | - * @param int|string $p_size | |
| 750 | - * @param array|int|string $where | |
| 751 | - * | |
| 752 | - * @return int | |
| 753 | - */ | |
| 754 | 599 | public static function getPageCount( $p_size, $where = '' ) { |
| 755 | 600 | $p_size = (int) $p_size; |
| 756 | - | |
| 601 | + $count = 1; | |
| 757 | 602 | if ( $p_size ) { |
| 758 | 603 | if ( ! is_numeric( $where ) ) { |
| 759 | 604 | $where = self::getRecordCount( $where ); |
| 760 | 605 | } |
| 761 | - | |
| 762 | - return ceil( (int) $where / $p_size ); | |
| 606 | + $count = ceil( (int) $where / $p_size ); | |
| 763 | 607 | } |
| 764 | 608 | |
| 765 | - return 1; | |
| 609 | + return $count; | |
| 766 | 610 | } |
| 767 | 611 | |
| 768 | 612 | /** |
| 769 | 613 | * Prepare the data before inserting it into the database |
| @@ -769,21 +613,24 @@ | ||
| 769 | 613 | * Prepare the data before inserting it into the database |
| 770 | 614 | * |
| 771 | 615 | * @since 2.0.16 |
| 772 | 616 | * |
| 773 | - * @param array $values | |
| 617 | + * @param array $values | |
| 774 | 618 | * @param string $type |
| 775 | 619 | * |
| 776 | - * @return array New values. | |
| 620 | + * @return array $new_values | |
| 777 | 621 | */ |
| 778 | 622 | private static function before_insert_entry_in_database( &$values, $type ) { |
| 623 | + | |
| 779 | 624 | self::sanitize_entry_post( $values ); |
| 780 | 625 | |
| 781 | - if ( $type !== 'xml' ) { | |
| 626 | + if ( $type != 'xml' ) { | |
| 782 | 627 | $values = apply_filters( 'frm_pre_create_entry', $values ); |
| 783 | 628 | } |
| 784 | 629 | |
| 785 | - return self::package_entry_data( $values ); | |
| 630 | + $new_values = self::package_entry_data( $values ); | |
| 631 | + | |
| 632 | + return $new_values; | |
| 786 | 633 | } |
| 787 | 634 | |
| 788 | 635 | /** |
| 789 | 636 | * Create an entry and perform after create actions |
| @@ -792,13 +639,12 @@ | ||
| 792 | 639 | * |
| 793 | 640 | * @param array $values |
| 794 | 641 | * @param array $new_values |
| 795 | 642 | * |
| 796 | - * @return bool|int Entry ID. | |
| 643 | + * @return boolean|int $entry_id | |
| 797 | 644 | */ |
| 798 | 645 | private static function continue_to_create_entry( $values, $new_values ) { |
| 799 | 646 | $entry_id = self::insert_entry_into_database( $new_values ); |
| 800 | - | |
| 801 | 647 | if ( ! $entry_id ) { |
| 802 | 648 | return false; |
| 803 | 649 | } |
| 804 | 650 | |
| @@ -811,11 +657,9 @@ | ||
| 811 | 657 | * Sanitize the POST values before we use them |
| 812 | 658 | * |
| 813 | 659 | * @since 2.0 |
| 814 | 660 | * |
| 815 | - * @param array $values The POST values by reference. | |
| 816 | - * | |
| 817 | - * @return void | |
| 661 | + * @param array $values The POST values by reference | |
| 818 | 662 | */ |
| 819 | 663 | public static function sanitize_entry_post( &$values ) { |
| 820 | 664 | $sanitize_method = array( |
| 821 | 665 | 'form_id' => 'absint', |
| @@ -840,9 +684,9 @@ | ||
| 840 | 684 | * @since 2.0.16 |
| 841 | 685 | * |
| 842 | 686 | * @param array $values |
| 843 | 687 | * |
| 844 | - * @return array New values. | |
| 688 | + * @return array $new_values | |
| 845 | 689 | */ |
| 846 | 690 | private static function package_entry_data( &$values ) { |
| 847 | 691 | global $wpdb; |
| 848 | 692 | |
| @@ -852,9 +696,9 @@ | ||
| 852 | 696 | |
| 853 | 697 | $item_name = self::get_new_entry_name( $values, $values['item_key'] ); |
| 854 | 698 | $new_values = array( |
| 855 | 699 | 'item_key' => FrmAppHelper::get_unique_key( $values['item_key'], $wpdb->prefix . 'frm_items', 'item_key' ), |
| 856 | - 'name' => FrmAppHelper::truncate( $item_name, 255, 1, '', true ), | |
| 700 | + 'name' => FrmAppHelper::truncate( $item_name, 255, 1, '' ), | |
| 857 | 701 | 'ip' => self::get_ip( $values ), |
| 858 | 702 | 'is_draft' => self::get_is_draft_value( $values ), |
| 859 | 703 | 'form_id' => (int) self::get_entry_value( $values, 'form_id', null ), |
| 860 | 704 | 'post_id' => (int) self::get_entry_value( $values, 'post_id', 0 ), |
| @@ -864,22 +708,15 @@ | ||
| 864 | 708 | 'description' => self::get_entry_description( $values ), |
| 865 | 709 | 'user_id' => self::get_entry_user_id( $values ), |
| 866 | 710 | ); |
| 867 | 711 | |
| 868 | - $new_values['updated_by'] = $values['updated_by'] ?? $new_values['user_id']; | |
| 712 | + $new_values['updated_by'] = isset( $values['updated_by'] ) ? $values['updated_by'] : $new_values['user_id']; | |
| 869 | 713 | |
| 870 | 714 | return $new_values; |
| 871 | 715 | } |
| 872 | 716 | |
| 873 | - /** | |
| 874 | - * @param array $values | |
| 875 | - * @param string $name | |
| 876 | - * @param mixed $default | |
| 877 | - * | |
| 878 | - * @return mixed | |
| 879 | - */ | |
| 880 | 717 | private static function get_entry_value( $values, $name, $default ) { |
| 881 | - return $values[ $name ] ?? $default; | |
| 718 | + return isset( $values[ $name ] ) ? $values[ $name ] : $default; | |
| 882 | 719 | } |
| 883 | 720 | |
| 884 | 721 | /** |
| 885 | 722 | * Get the ip for a new entry. |
| @@ -896,11 +733,10 @@ | ||
| 896 | 733 | return ''; |
| 897 | 734 | } |
| 898 | 735 | |
| 899 | 736 | $ip = FrmAppHelper::get_ip_address(); |
| 900 | - | |
| 901 | 737 | if ( defined( 'WP_IMPORTING' ) && WP_IMPORTING ) { |
| 902 | - return self::get_entry_value( $values, 'ip', $ip ); | |
| 738 | + $ip = self::get_entry_value( $values, 'ip', $ip ); | |
| 903 | 739 | } |
| 904 | 740 | |
| 905 | 741 | return $ip; |
| 906 | 742 | } |
| @@ -914,13 +750,9 @@ | ||
| 914 | 750 | * |
| 915 | 751 | * @return int |
| 916 | 752 | */ |
| 917 | 753 | private static function get_is_draft_value( $values ) { |
| 918 | - if ( isset( $values['frm_saving_draft'] ) && FrmEntriesHelper::DRAFT_ENTRY_STATUS === (int) $values['frm_saving_draft'] ) { | |
| 919 | - return FrmEntriesHelper::DRAFT_ENTRY_STATUS; | |
| 920 | - } | |
| 921 | - | |
| 922 | - return isset( $values['is_draft'] ) ? absint( $values['is_draft'] ) : FrmEntriesHelper::SUBMITTED_ENTRY_STATUS; | |
| 754 | + return ( ( isset( $values['frm_saving_draft'] ) && $values['frm_saving_draft'] == 1 ) || ( isset( $values['is_draft'] ) && $values['is_draft'] == 1 ) ) ? 1 : 0; | |
| 923 | 755 | } |
| 924 | 756 | |
| 925 | 757 | /** |
| 926 | 758 | * Get the created_at value for a new entry |
| @@ -944,9 +776,15 @@ | ||
| 944 | 776 | * |
| 945 | 777 | * @return string |
| 946 | 778 | */ |
| 947 | 779 | private static function get_updated_at( $values ) { |
| 948 | - return $values['updated_at'] ?? self::get_created_at( $values ); | |
| 780 | + if ( isset( $values['updated_at'] ) ) { | |
| 781 | + $updated_at = $values['updated_at']; | |
| 782 | + } else { | |
| 783 | + $updated_at = self::get_created_at( $values ); | |
| 784 | + } | |
| 785 | + | |
| 786 | + return $updated_at; | |
| 949 | 787 | } |
| 950 | 788 | |
| 951 | 789 | /** |
| 952 | 790 | * Get the description value for a new entry |
| @@ -957,18 +795,20 @@ | ||
| 957 | 795 | * |
| 958 | 796 | * @return string |
| 959 | 797 | */ |
| 960 | 798 | private static function get_entry_description( $values ) { |
| 961 | - if ( ! empty( $values['description'] ) ) { | |
| 962 | - return FrmAppHelper::maybe_json_encode( $values['description'] ); | |
| 799 | + if ( isset( $values['description'] ) && ! empty( $values['description'] ) ) { | |
| 800 | + $description = FrmAppHelper::maybe_json_encode( $values['description'] ); | |
| 801 | + } else { | |
| 802 | + $description = json_encode( | |
| 803 | + array( | |
| 804 | + 'browser' => FrmAppHelper::get_server_value( 'HTTP_USER_AGENT' ), | |
| 805 | + 'referrer' => FrmAppHelper::get_server_value( 'HTTP_REFERER' ), | |
| 806 | + ) | |
| 807 | + ); | |
| 963 | 808 | } |
| 964 | 809 | |
| 965 | - return json_encode( | |
| 966 | - array( | |
| 967 | - 'browser' => FrmAppHelper::get_server_value( 'HTTP_USER_AGENT' ), | |
| 968 | - 'referrer' => FrmAppHelper::get_server_value( 'HTTP_REFERER' ), | |
| 969 | - ) | |
| 970 | - ); | |
| 810 | + return $description; | |
| 971 | 811 | } |
| 972 | 812 | |
| 973 | 813 | /** |
| 974 | 814 | * Get the user_id value for a new entry |
| @@ -980,13 +820,15 @@ | ||
| 980 | 820 | * @return int |
| 981 | 821 | */ |
| 982 | 822 | private static function get_entry_user_id( $values ) { |
| 983 | 823 | if ( isset( $values['frm_user_id'] ) && ( is_numeric( $values['frm_user_id'] ) || FrmAppHelper::is_admin() ) ) { |
| 984 | - return $values['frm_user_id']; | |
| 824 | + $user_id = $values['frm_user_id']; | |
| 825 | + } else { | |
| 826 | + $current_user_id = get_current_user_id(); | |
| 827 | + $user_id = $current_user_id ? $current_user_id : 0; | |
| 985 | 828 | } |
| 986 | 829 | |
| 987 | - $current_user_id = get_current_user_id(); | |
| 988 | - return $current_user_id ? $current_user_id : 0; | |
| 830 | + return $user_id; | |
| 989 | 831 | } |
| 990 | 832 | |
| 991 | 833 | /** |
| 992 | 834 | * Insert new entry into the database |
| @@ -994,9 +836,9 @@ | ||
| 994 | 836 | * @since 2.0.16 |
| 995 | 837 | * |
| 996 | 838 | * @param array $new_values |
| 997 | 839 | * |
| 998 | - * @return bool|int Entry ID. | |
| 840 | + * @return int | boolean $entry_id | |
| 999 | 841 | */ |
| 1000 | 842 | private static function insert_entry_into_database( $new_values ) { |
| 1001 | 843 | global $wpdb; |
| 1002 | 844 | |
| @@ -1001,9 +843,15 @@ | ||
| 1001 | 843 | global $wpdb; |
| 1002 | 844 | |
| 1003 | 845 | $query_results = $wpdb->insert( $wpdb->prefix . 'frm_items', $new_values ); |
| 1004 | 846 | |
| 1005 | - return $query_results ? $wpdb->insert_id : false; | |
| 847 | + if ( ! $query_results ) { | |
| 848 | + $entry_id = false; | |
| 849 | + } else { | |
| 850 | + $entry_id = $wpdb->insert_id; | |
| 851 | + } | |
| 852 | + | |
| 853 | + return $entry_id; | |
| 1006 | 854 | } |
| 1007 | 855 | |
| 1008 | 856 | /** |
| 1009 | 857 | * Add the new entry to global $frm_vars |
| @@ -1009,11 +857,9 @@ | ||
| 1009 | 857 | * Add the new entry to global $frm_vars |
| 1010 | 858 | * |
| 1011 | 859 | * @since 2.0.16 |
| 1012 | 860 | * |
| 1013 | - * @param int|string $entry_id | |
| 1014 | - * | |
| 1015 | - * @return void | |
| 861 | + * @param int $entry_id | |
| 1016 | 862 | */ |
| 1017 | 863 | private static function add_new_entry_to_frm_vars( $entry_id ) { |
| 1018 | 864 | global $frm_vars; |
| 1019 | 865 | |
| @@ -1028,63 +874,32 @@ | ||
| 1028 | 874 | * Add entry metas, if there are any |
| 1029 | 875 | * |
| 1030 | 876 | * @since 2.0.16 |
| 1031 | 877 | * |
| 1032 | - * @param array $values | |
| 1033 | - * @param int|string $entry_id | |
| 1034 | - * | |
| 878 | + * @param array $values | |
| 879 | + * @param int $entry_id | |
| 1035 | 880 | * @return void |
| 1036 | 881 | */ |
| 1037 | 882 | private static function maybe_add_entry_metas( $values, $entry_id ) { |
| 1038 | 883 | if ( isset( $values['item_meta'] ) ) { |
| 1039 | 884 | FrmEntryMeta::update_entry_metas( $entry_id, $values['item_meta'] ); |
| 1040 | - self::maybe_add_unique_id_meta( $values, $entry_id ); | |
| 1041 | 885 | } |
| 1042 | 886 | self::maybe_add_captcha_meta( (int) $values['form_id'], (int) $entry_id ); |
| 1043 | 887 | } |
| 1044 | 888 | |
| 1045 | 889 | /** |
| 1046 | - * @since 6.16.3 | |
| 1047 | - * | |
| 1048 | - * @param array $values | |
| 1049 | - * @param int $entry_id | |
| 1050 | - * | |
| 1051 | - * @return void | |
| 1052 | - */ | |
| 1053 | - private static function maybe_add_unique_id_meta( $values, $entry_id ) { | |
| 1054 | - if ( ! empty( $values['parent_form_id'] ) || empty( $values['unique_id'] ) || ! self::should_check_for_unique_id_match() ) { | |
| 1055 | - return; | |
| 1056 | - } | |
| 1057 | - | |
| 1058 | - // This unique ID is inserted with JS on form submit. | |
| 1059 | - // It is used to check for duplicate entries. | |
| 1060 | - $unique_id = sanitize_key( $values['unique_id'] ); | |
| 1061 | - | |
| 1062 | - if ( ! $unique_id ) { | |
| 1063 | - return; | |
| 1064 | - } | |
| 1065 | - | |
| 1066 | - FrmEntryMeta::add_entry_meta( $entry_id, 0, '', compact( 'unique_id' ) ); | |
| 1067 | - self::flag_new_unique_key( $unique_id ); | |
| 1068 | - } | |
| 1069 | - | |
| 1070 | - /** | |
| 1071 | 890 | * @since 5.0.15 |
| 1072 | 891 | * |
| 1073 | 892 | * @param int $form_id |
| 1074 | 893 | * @param int $entry_id |
| 1075 | - * | |
| 1076 | 894 | * @return void |
| 1077 | 895 | */ |
| 1078 | 896 | private static function maybe_add_captcha_meta( $form_id, $entry_id ) { |
| 1079 | 897 | global $frm_vars; |
| 1080 | - | |
| 1081 | - if ( ! array_key_exists( 'captcha_scores', $frm_vars ) || ! array_key_exists( $form_id, $frm_vars['captcha_scores'] ) ) { | |
| 1082 | - return; | |
| 898 | + if ( array_key_exists( 'captcha_scores', $frm_vars ) && array_key_exists( $form_id, $frm_vars['captcha_scores'] ) ) { | |
| 899 | + $captcha_score_meta = array( 'captcha_score' => $frm_vars['captcha_scores'][ $form_id ] ); | |
| 900 | + FrmEntryMeta::add_entry_meta( $entry_id, 0, '', maybe_serialize( $captcha_score_meta ) ); | |
| 1083 | 901 | } |
| 1084 | - | |
| 1085 | - $captcha_score_meta = array( 'captcha_score' => $frm_vars['captcha_scores'][ $form_id ] ); | |
| 1086 | - FrmEntryMeta::add_entry_meta( $entry_id, 0, '', maybe_serialize( $captcha_score_meta ) ); | |
| 1087 | 902 | } |
| 1088 | 903 | |
| 1089 | 904 | /** |
| 1090 | 905 | * Trigger frm_after_create_entry hooks |
| @@ -1090,30 +905,17 @@ | ||
| 1090 | 905 | * Trigger frm_after_create_entry hooks |
| 1091 | 906 | * |
| 1092 | 907 | * @since 2.0.16 |
| 1093 | 908 | * |
| 1094 | - * @param int $entry_id | |
| 1095 | - * @param array $values | |
| 909 | + * @param int $entry_id | |
| 1096 | 910 | * @param array $new_values |
| 1097 | - * | |
| 1098 | - * @return void | |
| 1099 | 911 | */ |
| 1100 | 912 | private static function after_entry_created_actions( $entry_id, $values, $new_values ) { |
| 1101 | - // This is a child entry. | |
| 1102 | - $is_child = isset( $values['parent_nonce'] ) && ! empty( $values['parent_form_id'] ) && wp_verify_nonce( $values['parent_nonce'], 'parent' ); | |
| 913 | + // this is a child entry | |
| 914 | + $is_child = isset( $values['parent_form_id'] ) && isset( $values['parent_nonce'] ) && ! empty( $values['parent_form_id'] ) && wp_verify_nonce( $values['parent_nonce'], 'parent' ); | |
| 1103 | 915 | |
| 1104 | 916 | do_action( 'frm_after_create_entry', $entry_id, $new_values['form_id'], compact( 'is_child' ) ); |
| 1105 | 917 | do_action( 'frm_after_create_entry_' . $new_values['form_id'], $entry_id, compact( 'is_child' ) ); |
| 1106 | - | |
| 1107 | - if ( ! empty( $values['form_key'] ) ) { | |
| 1108 | - /** | |
| 1109 | - * @since 6.30 | |
| 1110 | - * | |
| 1111 | - * @param int $entry_id | |
| 1112 | - * @param array $is_child | |
| 1113 | - */ | |
| 1114 | - do_action( 'frm_after_create_entry_' . $values['form_key'], $entry_id, compact( 'is_child' ) ); | |
| 1115 | - } | |
| 1116 | 918 | } |
| 1117 | 919 | |
| 1118 | 920 | /** |
| 1119 | 921 | * Actions to perform immediately after an entry is inserted in the frm_items database |
| @@ -1121,13 +923,12 @@ | ||
| 1121 | 923 | * @since 2.0.16 |
| 1122 | 924 | * |
| 1123 | 925 | * @param array $values |
| 1124 | 926 | * @param array $new_values |
| 1125 | - * @param int $entry_id | |
| 1126 | - * | |
| 1127 | - * @return void | |
| 927 | + * @param int $entry_id | |
| 1128 | 928 | */ |
| 1129 | 929 | private static function after_insert_entry_in_database( $values, $new_values, $entry_id ) { |
| 930 | + | |
| 1130 | 931 | self::add_new_entry_to_frm_vars( $entry_id ); |
| 1131 | 932 | |
| 1132 | 933 | self::maybe_add_entry_metas( $values, $entry_id ); |
| 1133 | 934 | |
| @@ -1140,13 +941,13 @@ | ||
| 1140 | 941 | * Perform some actions right before updating an entry |
| 1141 | 942 | * |
| 1142 | 943 | * @since 2.0.16 |
| 1143 | 944 | * |
| 1144 | - * @param int|string $id | |
| 1145 | - * @param array $values | |
| 1146 | - * @param string $update_type | |
| 945 | + * @param int $id | |
| 946 | + * @param array $values | |
| 947 | + * @param string $update_type | |
| 1147 | 948 | * |
| 1148 | - * @return bool Update. | |
| 949 | + * @return boolean $update | |
| 1149 | 950 | */ |
| 1150 | 951 | private static function before_update_entry( $id, &$values, $update_type ) { |
| 1151 | 952 | $update = true; |
| 1152 | 953 | |
| @@ -1151,14 +952,13 @@ | ||
| 1151 | 952 | $update = true; |
| 1152 | 953 | |
| 1153 | 954 | global $frm_vars; |
| 1154 | 955 | |
| 1155 | - // phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict | |
| 1156 | - if ( isset( $frm_vars['saved_entries'] ) && is_array( $frm_vars['saved_entries'] ) && in_array( (int) $id, $frm_vars['saved_entries'] ) ) { | |
| 956 | + if ( isset( $frm_vars['saved_entries'] ) && is_array( $frm_vars['saved_entries'] ) && in_array( (int) $id, (array) $frm_vars['saved_entries'] ) ) { | |
| 1157 | 957 | $update = false; |
| 1158 | 958 | } |
| 1159 | 959 | |
| 1160 | - if ( $update && $update_type !== 'xml' ) { | |
| 960 | + if ( $update && $update_type != 'xml' ) { | |
| 1161 | 961 | $values = apply_filters( 'frm_pre_update_entry', $values, $id ); |
| 1162 | 962 | } |
| 1163 | 963 | |
| 1164 | 964 | return $update; |
| @@ -1168,22 +968,22 @@ | ||
| 1168 | 968 | * Package the entry data for updating |
| 1169 | 969 | * |
| 1170 | 970 | * @since 2.0.16 |
| 1171 | 971 | * |
| 1172 | - * @param int $id | |
| 972 | + * @param int $id | |
| 1173 | 973 | * @param array $values |
| 1174 | 974 | * |
| 1175 | - * @return array New values. | |
| 975 | + * @return array $new_values | |
| 1176 | 976 | */ |
| 1177 | 977 | private static function package_entry_to_update( $id, $values ) { |
| 1178 | 978 | global $wpdb; |
| 1179 | 979 | |
| 1180 | 980 | $new_values = array( |
| 1181 | - 'name' => FrmAppHelper::truncate( self::get_new_entry_name( $values ), 255, 1, '', true ), | |
| 981 | + 'name' => self::get_new_entry_name( $values ), | |
| 1182 | 982 | 'form_id' => (int) self::get_entry_value( $values, 'form_id', null ), |
| 1183 | 983 | 'is_draft' => self::get_is_draft_value( $values ), |
| 1184 | 984 | 'updated_at' => current_time( 'mysql', 1 ), |
| 1185 | - 'updated_by' => $values['updated_by'] ?? get_current_user_id(), | |
| 985 | + 'updated_by' => isset( $values['updated_by'] ) ? $values['updated_by'] : get_current_user_id(), | |
| 1186 | 986 | ); |
| 1187 | 987 | |
| 1188 | 988 | if ( isset( $values['post_id'] ) ) { |
| 1189 | 989 | $new_values['post_id'] = (int) $values['post_id']; |
| @@ -1200,9 +1000,11 @@ | ||
| 1200 | 1000 | if ( isset( $values['frm_user_id'] ) && is_numeric( $values['frm_user_id'] ) ) { |
| 1201 | 1001 | $new_values['user_id'] = $values['frm_user_id']; |
| 1202 | 1002 | } |
| 1203 | 1003 | |
| 1204 | - return apply_filters( 'frm_update_entry', $new_values, $id ); | |
| 1004 | + $new_values = apply_filters( 'frm_update_entry', $new_values, $id ); | |
| 1005 | + | |
| 1006 | + return $new_values; | |
| 1205 | 1007 | } |
| 1206 | 1008 | |
| 1207 | 1009 | /** |
| 1208 | 1010 | * Perform some actions right after updating an entry |
| @@ -1208,14 +1010,12 @@ | ||
| 1208 | 1010 | * Perform some actions right after updating an entry |
| 1209 | 1011 | * |
| 1210 | 1012 | * @since 2.0.16 |
| 1211 | 1013 | * |
| 1212 | - * @param bool|int $query_results | |
| 1213 | - * @param int|string $id | |
| 1214 | - * @param array $values | |
| 1215 | - * @param array $new_values | |
| 1216 | - * | |
| 1217 | - * @return void | |
| 1014 | + * @param boolean|int $query_results | |
| 1015 | + * @param int $id | |
| 1016 | + * @param array $values | |
| 1017 | + * @param array $new_values | |
| 1218 | 1018 | */ |
| 1219 | 1019 | private static function after_update_entry( $query_results, $id, $values, $new_values ) { |
| 1220 | 1020 | if ( $query_results ) { |
| 1221 | 1021 | self::clear_cache(); |
| @@ -1221,9 +1021,8 @@ | ||
| 1221 | 1021 | self::clear_cache(); |
| 1222 | 1022 | } |
| 1223 | 1023 | |
| 1224 | 1024 | global $frm_vars; |
| 1225 | - | |
| 1226 | 1025 | if ( ! isset( $frm_vars['saved_entries'] ) ) { |
| 1227 | 1026 | $frm_vars['saved_entries'] = array(); |
| 1228 | 1027 | } |
| 1229 | 1028 | |
| @@ -1234,17 +1033,8 @@ | ||
| 1234 | 1033 | } |
| 1235 | 1034 | |
| 1236 | 1035 | do_action( 'frm_after_update_entry', $id, $new_values['form_id'] ); |
| 1237 | 1036 | do_action( 'frm_after_update_entry_' . $new_values['form_id'], $id ); |
| 1238 | - | |
| 1239 | - if ( ! empty( $values['form_key'] ) ) { | |
| 1240 | - /** | |
| 1241 | - * @since 6.30 | |
| 1242 | - * | |
| 1243 | - * @param int $entry_id | |
| 1244 | - */ | |
| 1245 | - do_action( 'frm_after_update_entry_' . $values['form_key'], $id ); | |
| 1246 | - } | |
| 1247 | 1037 | } |
| 1248 | 1038 | |
| 1249 | 1039 | /** |
| 1250 | 1040 | * Create entry from an XML import |
| @@ -1253,12 +1043,14 @@ | ||
| 1253 | 1043 | * @since 2.0.16 |
| 1254 | 1044 | * |
| 1255 | 1045 | * @param array $values |
| 1256 | 1046 | * |
| 1257 | - * @return bool|int Entry ID. | |
| 1047 | + * @return int | boolean $entry_id | |
| 1258 | 1048 | */ |
| 1259 | 1049 | public static function create_entry_from_xml( $values ) { |
| 1260 | - return self::create_entry( $values, 'xml' ); | |
| 1050 | + $entry_id = self::create_entry( $values, 'xml' ); | |
| 1051 | + | |
| 1052 | + return $entry_id; | |
| 1261 | 1053 | } |
| 1262 | 1054 | |
| 1263 | 1055 | /** |
| 1264 | 1056 | * Update entry from an XML import |
| @@ -1265,15 +1057,17 @@ | ||
| 1265 | 1057 | * Certain actions aren't necessary when importing (like saving sub entries and modifying other vals) |
| 1266 | 1058 | * |
| 1267 | 1059 | * @since 2.0.16 |
| 1268 | 1060 | * |
| 1269 | - * @param int $id | |
| 1061 | + * @param int $id | |
| 1270 | 1062 | * @param array $values |
| 1271 | 1063 | * |
| 1272 | - * @return bool|int Updated. | |
| 1064 | + * @return int | boolean $updated | |
| 1273 | 1065 | */ |
| 1274 | 1066 | public static function update_entry_from_xml( $id, $values ) { |
| 1275 | - return self::update_entry( $id, $values, 'xml' ); | |
| 1067 | + $updated = self::update_entry( $id, $values, 'xml' ); | |
| 1068 | + | |
| 1069 | + return $updated; | |
| 1276 | 1070 | } |
| 1277 | 1071 | |
| 1278 | 1072 | /** |
| 1279 | 1073 | * @param string $key |
| @@ -1281,23 +1075,8 @@ | ||
| 1281 | 1075 | * @return int entry_id |
| 1282 | 1076 | */ |
| 1283 | 1077 | public static function get_id_by_key( $key ) { |
| 1284 | 1078 | $entry_id = FrmDb::get_var( 'frm_items', array( 'item_key' => sanitize_title( $key ) ) ); |
| 1079 | + | |
| 1285 | 1080 | return (int) $entry_id; |
| 1286 | - } | |
| 1287 | - | |
| 1288 | - /** | |
| 1289 | - * Get entries count. | |
| 1290 | - * | |
| 1291 | - * @since 6.8 | |
| 1292 | - * | |
| 1293 | - * @return int|string | |
| 1294 | - */ | |
| 1295 | - public static function get_entries_count() { | |
| 1296 | - $args = array( | |
| 1297 | - 'or' => 1, | |
| 1298 | - 'parent_form_id' => null, | |
| 1299 | - 'parent_form_id <' => 1, | |
| 1300 | - ); | |
| 1301 | - return self::getRecordCount( $args ); | |
| 1302 | 1081 | } |
| 1303 | 1082 | } |
