Completed
Pull Request — master (#441)
by
unknown
02:48
created
classes/models/FrmEntry.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 			$metas       = FrmEntryMeta::get_entry_meta_info( $entry_exist );
78 78
 			$field_metas = array();
79 79
 			foreach ( $metas as $meta ) {
80
-				$field_metas[ $meta->field_id ] = $meta->meta_value;
80
+				$field_metas[$meta->field_id] = $meta->meta_value;
81 81
 			}
82 82
 
83 83
 			$filtered_vals = array_filter( $values['item_meta'] );
@@ -131,10 +131,10 @@  discard block
 block discarded – undo
131 131
 		$reduced = array();
132 132
 		foreach ( $filter_vals as $field_id => $value ) {
133 133
 			$field                = FrmFieldFactory::get_field_object( $field_id );
134
-			$reduced[ $field_id ] = $field->get_value_to_save( $value, array( 'entry_id' => $entry_id ) );
135
-			$reduced[ $field_id ] = $field->set_value_before_save( $reduced[ $field_id ] );
136
-			if ( '' === $reduced[ $field_id ] || ( is_array( $reduced[ $field_id ] ) && 0 === count( $reduced[ $field_id ] ) ) ) {
137
-				unset( $reduced[ $field_id ] );
134
+			$reduced[$field_id] = $field->get_value_to_save( $value, array( 'entry_id' => $entry_id ) );
135
+			$reduced[$field_id] = $field->set_value_before_save( $reduced[$field_id] );
136
+			if ( '' === $reduced[$field_id] || ( is_array( $reduced[$field_id] ) && 0 === count( $reduced[$field_id] ) ) ) {
137
+				unset( $reduced[$field_id] );
138 138
 			}
139 139
 		}
140 140
 		return $reduced;
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
 		$query = "SELECT it.*, fr.name as form_name, fr.form_key as form_key FROM {$wpdb->prefix}frm_items it
328 328
                   LEFT OUTER JOIN {$wpdb->prefix}frm_forms fr ON it.form_id=fr.id WHERE ";
329 329
 
330
-		$query      .= is_numeric( $id ) ? 'it.id=%d' : 'it.item_key=%s';
330
+		$query .= is_numeric( $id ) ? 'it.id=%d' : 'it.item_key=%s';
331 331
 		$query_args = array( $id );
332 332
 		$query      = $wpdb->prepare( $query, $query_args ); // WPCS: unprepared SQL ok.
333 333
 
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
 	private static function prepare_entries( &$entries ) {
373 373
 		foreach ( $entries as $k => $entry ) {
374 374
 			self::prepare_entry( $entry );
375
-			$entries[ $k ] = $entry;
375
+			$entries[$k] = $entry;
376 376
 		}
377 377
 	}
378 378
 
@@ -397,20 +397,20 @@  discard block
 block discarded – undo
397 397
 		foreach ( $metas as $meta_val ) {
398 398
 			if ( $meta_val->item_id == $entry->id ) {
399 399
 				FrmAppHelper::unserialize_or_decode( $meta_val->meta_value );
400
-				$entry->metas[ $meta_val->field_id ] = $meta_val->meta_value;
400
+				$entry->metas[$meta_val->field_id] = $meta_val->meta_value;
401 401
 				if ( $include_key ) {
402
-					$entry->metas[ $meta_val->field_key ] = $entry->metas[ $meta_val->field_id ];
402
+					$entry->metas[$meta_val->field_key] = $entry->metas[$meta_val->field_id];
403 403
 				}
404 404
 				continue;
405 405
 			}
406 406
 
407 407
 			// include sub entries in an array
408
-			if ( ! isset( $entry->metas[ $meta_val->field_id ] ) ) {
409
-				$entry->metas[ $meta_val->field_id ] = array();
408
+			if ( ! isset( $entry->metas[$meta_val->field_id] ) ) {
409
+				$entry->metas[$meta_val->field_id] = array();
410 410
 			}
411 411
 
412 412
 			FrmAppHelper::unserialize_or_decode( $meta_val->meta_value );
413
-			$entry->metas[ $meta_val->field_id ][] = $meta_val->meta_value;
413
+			$entry->metas[$meta_val->field_id][] = $meta_val->meta_value;
414 414
 
415 415
 			unset( $meta_val );
416 416
 		}
@@ -457,13 +457,13 @@  discard block
 block discarded – undo
457 457
 
458 458
 			if ( $inc_form ) {
459 459
 				$fields = 'it.*, fr.name as form_name,fr.form_key as form_key';
460
-				$table  .= 'LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fr ON it.form_id=fr.id ';
460
+				$table .= 'LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fr ON it.form_id=fr.id ';
461 461
 			}
462 462
 
463 463
 			if ( preg_match( '/ meta_([0-9]+)/', $order_by, $order_matches ) ) {
464 464
 				// sort by a requested field
465 465
 				$field_id = (int) $order_matches[1];
466
-				$fields   .= ', (SELECT meta_value FROM ' . $wpdb->prefix . 'frm_item_metas WHERE field_id = ' . $field_id . ' AND item_id = it.id) as meta_' . $field_id;
466
+				$fields .= ', (SELECT meta_value FROM ' . $wpdb->prefix . 'frm_item_metas WHERE field_id = ' . $field_id . ' AND item_id = it.id) as meta_' . $field_id;
467 467
 				unset( $order_matches, $field_id );
468 468
 			}
469 469
 
@@ -503,16 +503,16 @@  discard block
 block discarded – undo
503 503
 		}
504 504
 
505 505
 		foreach ( $metas as $m_key => $meta_val ) {
506
-			if ( ! isset( $entries[ $meta_val->item_id ] ) ) {
506
+			if ( ! isset( $entries[$meta_val->item_id] ) ) {
507 507
 				continue;
508 508
 			}
509 509
 
510
-			if ( ! isset( $entries[ $meta_val->item_id ]->metas ) ) {
511
-				$entries[ $meta_val->item_id ]->metas = array();
510
+			if ( ! isset( $entries[$meta_val->item_id]->metas ) ) {
511
+				$entries[$meta_val->item_id]->metas = array();
512 512
 			}
513 513
 
514 514
 			FrmAppHelper::unserialize_or_decode( $meta_val->meta_value );
515
-			$entries[ $meta_val->item_id ]->metas[ $meta_val->field_id ] = $meta_val->meta_value;
515
+			$entries[$meta_val->item_id]->metas[$meta_val->field_id] = $meta_val->meta_value;
516 516
 			unset( $m_key, $meta_val );
517 517
 		}
518 518
 
@@ -670,7 +670,7 @@  discard block
 block discarded – undo
670 670
 	}
671 671
 
672 672
 	private static function get_entry_value( $values, $name, $default ) {
673
-		return isset( $values[ $name ] ) ? $values[ $name ] : $default;
673
+		return isset( $values[$name] ) ? $values[$name] : $default;
674 674
 	}
675 675
 
676 676
 	/**
Please login to merge, or discard this patch.