Completed
Pull Request — master (#2422)
by
unknown
42s
created
classes/helpers/FrmCSVExportHelper.php 1 patch
Spacing   +54 added lines, -54 removed lines patch added patch discarded remove patch
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 
155 155
 		unset( $filename );
156 156
 
157
-		$comment_count       = FrmDb::get_count(
157
+		$comment_count = FrmDb::get_count(
158 158
 			'frm_item_metas',
159 159
 			array(
160 160
 				'item_id'         => $atts['entry_ids'],
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
 	private static function prepare_csv_headings() {
301 301
 		$headings = array();
302 302
 		self::csv_headings( $headings );
303
-		$headings       = apply_filters(
303
+		$headings = apply_filters(
304 304
 			'frm_csv_columns',
305 305
 			$headings,
306 306
 			self::$form_id,
@@ -324,10 +324,10 @@  discard block
 block discarded – undo
324 324
 		$field_headings  = array();
325 325
 		$separate_values = array( 'user_id', 'file', 'data', 'date' );
326 326
 		if ( ! empty( $col->field_options['separate_value'] ) && ! in_array( $col->type, $separate_values, true ) ) {
327
-			$field_headings[ $col->id . '_label' ] = strip_tags( $col->name . ' ' . __( '(label)', 'formidable' ) );
327
+			$field_headings[$col->id . '_label'] = strip_tags( $col->name . ' ' . __( '(label)', 'formidable' ) );
328 328
 		}
329 329
 
330
-		$field_headings[ $col->id ] = strip_tags( $col->name );
330
+		$field_headings[$col->id] = strip_tags( $col->name );
331 331
 		$field_headings             = apply_filters(
332 332
 			'frm_csv_field_columns',
333 333
 			$field_headings,
@@ -348,14 +348,14 @@  discard block
 block discarded – undo
348 348
 			if ( self::is_the_child_of_a_repeater( $col ) ) {
349 349
 				$repeater_id = $col->field_options['in_section'];
350 350
 				// Set a placeholder to maintain order for repeater fields.
351
-				$headings[ 'repeater' . $repeater_id ] = array();
351
+				$headings['repeater' . $repeater_id] = array();
352 352
 
353
-				if ( ! isset( $fields_by_repeater_id[ $repeater_id ] ) ) {
354
-					$fields_by_repeater_id[ $repeater_id ] = array();
353
+				if ( ! isset( $fields_by_repeater_id[$repeater_id] ) ) {
354
+					$fields_by_repeater_id[$repeater_id] = array();
355 355
 					$repeater_ids[]                        = $repeater_id;
356 356
 				}
357 357
 
358
-				$fields_by_repeater_id[ $repeater_id ][] = $col;
358
+				$fields_by_repeater_id[$repeater_id][] = $col;
359 359
 
360 360
 				continue;
361 361
 			}
@@ -374,8 +374,8 @@  discard block
 block discarded – undo
374 374
 				$end    = strpos( $row->meta_value, ':{' );
375 375
 				$length = substr( $row->meta_value, $start, $end - $start );
376 376
 
377
-				if ( $length > $max[ $row->field_id ] ) {
378
-					$max[ $row->field_id ] = $length;
377
+				if ( $length > $max[$row->field_id] ) {
378
+					$max[$row->field_id] = $length;
379 379
 				}
380 380
 			}
381 381
 			unset( $start, $end, $length, $row, $repeater_meta, $where );
@@ -386,17 +386,17 @@  discard block
 block discarded – undo
386 386
 					$repeater_id = str_replace( 'repeater', '', $key );
387 387
 
388 388
 					$repeater_headings = array();
389
-					foreach ( $fields_by_repeater_id[ $repeater_id ] as $col ) {
389
+					foreach ( $fields_by_repeater_id[$repeater_id] as $col ) {
390 390
 						$repeater_headings += self::field_headings( $col );
391 391
 					}
392 392
 
393
-					for ( $i = 0; $i < $max[ $repeater_id ]; $i++ ) {
393
+					for ( $i = 0; $i < $max[$repeater_id]; $i ++ ) {
394 394
 						foreach ( $repeater_headings as $repeater_key => $repeater_name ) {
395
-							$flat[ $repeater_key . '[' . $i . ']' ] = $repeater_name;
395
+							$flat[$repeater_key . '[' . $i . ']'] = $repeater_name;
396 396
 						}
397 397
 					}
398 398
 				} else {
399
-					$flat[ $key ] = $heading;
399
+					$flat[$key] = $heading;
400 400
 				}
401 401
 			}
402 402
 
@@ -409,10 +409,10 @@  discard block
 block discarded – undo
409 409
 		}//end if
410 410
 
411 411
 		if ( self::$comment_count ) {
412
-			for ( $i = 0; $i < self::$comment_count; $i++ ) {
413
-				$headings[ 'comment' . $i ]            = __( 'Comment', 'formidable' );
414
-				$headings[ 'comment_user_id' . $i ]    = __( 'Comment User', 'formidable' );
415
-				$headings[ 'comment_created_at' . $i ] = __( 'Comment Date', 'formidable' );
412
+			for ( $i = 0; $i < self::$comment_count; $i ++ ) {
413
+				$headings['comment' . $i]            = __( 'Comment', 'formidable' );
414
+				$headings['comment_user_id' . $i]    = __( 'Comment User', 'formidable' );
415
+				$headings['comment_created_at' . $i] = __( 'Comment Date', 'formidable' );
416 416
 			}
417 417
 			unset( $i );
418 418
 		}
@@ -457,7 +457,7 @@  discard block
 block discarded – undo
457 457
 
458 458
 	private static function prepare_next_csv_rows( $next_set ) {
459 459
 		if ( FrmAppHelper::pro_is_installed() ) {
460
-			$where    = array(
460
+			$where = array(
461 461
 				'or'             => 1,
462 462
 				'id'             => $next_set,
463 463
 				'parent_item_id' => $next_set,
@@ -515,32 +515,32 @@  discard block
 block discarded – undo
515 515
 					continue;
516 516
 				}
517 517
 
518
-				if ( ! isset( $entries[ self::$entry->parent_item_id ] ) ) {
519
-					$entries[ self::$entry->parent_item_id ]        = new stdClass();
520
-					$entries[ self::$entry->parent_item_id ]->metas = array();
518
+				if ( ! isset( $entries[self::$entry->parent_item_id] ) ) {
519
+					$entries[self::$entry->parent_item_id]        = new stdClass();
520
+					$entries[self::$entry->parent_item_id]->metas = array();
521 521
 				}
522 522
 
523
-				if ( ! isset( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) {
524
-					$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = array();
525
-				} elseif ( ! is_array( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) {
523
+				if ( ! isset( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) {
524
+					$entries[self::$entry->parent_item_id]->metas[$meta_id] = array();
525
+				} elseif ( ! is_array( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) {
526 526
 					// if the data is here, it should be an array but if this field has collected data
527 527
 					// both while inside and outside of the repeating section, it's possible this is a string.
528
-					$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = (array) $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ];
528
+					$entries[self::$entry->parent_item_id]->metas[$meta_id] = (array) $entries[self::$entry->parent_item_id]->metas[$meta_id];
529 529
 				}
530 530
 
531 531
 				// Add the repeated values.
532
-				$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ][] = $meta_value;
532
+				$entries[self::$entry->parent_item_id]->metas[$meta_id][] = $meta_value;
533 533
 			}//end foreach
534 534
 
535 535
 			self::$entry->metas                              = self::fill_missing_repeater_metas( self::$entry->metas, $entries );
536
-			$entries[ self::$entry->parent_item_id ]->metas += self::$entry->metas;
536
+			$entries[self::$entry->parent_item_id]->metas += self::$entry->metas;
537 537
 		}//end if
538 538
 
539 539
 		// add the embedded form id
540
-		if ( ! isset( $entries[ self::$entry->parent_item_id ]->embedded_fields ) ) {
541
-			$entries[ self::$entry->parent_item_id ]->embedded_fields = array();
540
+		if ( ! isset( $entries[self::$entry->parent_item_id]->embedded_fields ) ) {
541
+			$entries[self::$entry->parent_item_id]->embedded_fields = array();
542 542
 		}
543
-		$entries[ self::$entry->parent_item_id ]->embedded_fields[ self::$entry->id ] = self::$entry->form_id;
543
+		$entries[self::$entry->parent_item_id]->embedded_fields[self::$entry->id] = self::$entry->form_id;
544 544
 	}
545 545
 
546 546
 	/**
@@ -561,19 +561,19 @@  discard block
 block discarded – undo
561 561
 		}
562 562
 
563 563
 		$repeater_id = $field->field_options['in_section'];
564
-		if ( ! isset( self::$fields_by_repeater_id[ $repeater_id ] ) ) {
564
+		if ( ! isset( self::$fields_by_repeater_id[$repeater_id] ) ) {
565 565
 			return $metas;
566 566
 		}
567 567
 
568
-		foreach ( self::$fields_by_repeater_id[ $repeater_id ] as $repeater_child ) {
569
-			if ( ! isset( $metas[ $repeater_child->id ] ) ) {
570
-				$metas[ $repeater_child->id ] = '';
568
+		foreach ( self::$fields_by_repeater_id[$repeater_id] as $repeater_child ) {
569
+			if ( ! isset( $metas[$repeater_child->id] ) ) {
570
+				$metas[$repeater_child->id] = '';
571 571
 
572
-				if ( ! isset( $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] ) || ! is_array( $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] ) ) {
573
-					$entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] = array();
572
+				if ( ! isset( $entries[self::$entry->parent_item_id]->metas[$repeater_child->id] ) || ! is_array( $entries[self::$entry->parent_item_id]->metas[$repeater_child->id] ) ) {
573
+					$entries[self::$entry->parent_item_id]->metas[$repeater_child->id] = array();
574 574
 				}
575 575
 
576
-				$entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ][] = '';
576
+				$entries[self::$entry->parent_item_id]->metas[$repeater_child->id][] = '';
577 577
 			}
578 578
 		}
579 579
 
@@ -592,7 +592,7 @@  discard block
 block discarded – undo
592 592
 
593 593
 	private static function add_field_values_to_csv( &$row ) {
594 594
 		foreach ( self::$fields as $col ) {
595
-			$field_value = isset( self::$entry->metas[ $col->id ] ) ? self::$entry->metas[ $col->id ] : false;
595
+			$field_value = isset( self::$entry->metas[$col->id] ) ? self::$entry->metas[$col->id] : false;
596 596
 
597 597
 			FrmFieldsHelper::prepare_field_value( $field_value, $col->type );
598 598
 
@@ -612,20 +612,20 @@  discard block
 block discarded – undo
612 612
 			if ( ! empty( $col->field_options['separate_value'] ) ) {
613 613
 				$label_key = $col->id . '_label';
614 614
 				if ( self::is_the_child_of_a_repeater( $col ) ) {
615
-					$row[ $label_key ] = array();
615
+					$row[$label_key] = array();
616 616
 
617 617
 					if ( is_array( $field_value ) ) {
618 618
 						foreach ( $field_value as $value ) {
619
-							$row[ $label_key ][] = self::get_separate_value_label( $value, $col );
619
+							$row[$label_key][] = self::get_separate_value_label( $value, $col );
620 620
 						}
621 621
 					}
622 622
 				} else {
623
-					$row[ $label_key ] = self::get_separate_value_label( $field_value, $col );
623
+					$row[$label_key] = self::get_separate_value_label( $field_value, $col );
624 624
 				}
625 625
 				unset( $label_key );
626 626
 			}
627 627
 
628
-			$row[ $col->id ] = $field_value;
628
+			$row[$col->id] = $field_value;
629 629
 
630 630
 			unset( $col, $field_value );
631 631
 		}//end foreach
@@ -648,7 +648,7 @@  discard block
 block discarded – undo
648 648
 				'show_icon'         => false,
649 649
 				'entry_id'          => self::$entry->id,
650 650
 				'sep'               => self::$separator,
651
-				'embedded_field_id' => isset( self::$entry->embedded_fields ) && isset( self::$entry->embedded_fields[ self::$entry->id ] ) ? 'form' . self::$entry->embedded_fields[ self::$entry->id ] : 0,
651
+				'embedded_field_id' => isset( self::$entry->embedded_fields ) && isset( self::$entry->embedded_fields[self::$entry->id] ) ? 'form' . self::$entry->embedded_fields[self::$entry->id] : 0,
652 652
 			)
653 653
 		);
654 654
 	}
@@ -663,8 +663,8 @@  discard block
 block discarded – undo
663 663
 					// This is combo field inside repeater. The heading key has this format: [86_first[0]].
664 664
 					foreach ( $sub_value as $sub_key => $sub_sub_value ) {
665 665
 						$column_key = $atts['col']->id . '_' . $sub_key . '[' . $key . ']';
666
-						if ( ! is_numeric( $sub_key ) && isset( self::$headings[ $column_key ] ) ) {
667
-							$row[ $column_key ] = $sub_sub_value;
666
+						if ( ! is_numeric( $sub_key ) && isset( self::$headings[$column_key] ) ) {
667
+							$row[$column_key] = $sub_sub_value;
668 668
 						}
669 669
 					}
670 670
 
@@ -672,8 +672,8 @@  discard block
 block discarded – undo
672 672
 				}
673 673
 
674 674
 				$column_key = $atts['col']->id . '_' . $key;
675
-				if ( ! is_numeric( $key ) && isset( self::$headings[ $column_key ] ) ) {
676
-					$row[ $column_key ] = $sub_value;
675
+				if ( ! is_numeric( $key ) && isset( self::$headings[$column_key] ) ) {
676
+					$row[$column_key] = $sub_value;
677 677
 				}
678 678
 				// if ( isset( self::$headings['lat_lng'] ) && isset( $atts['field_value']['lat_lng'] ) ) {
679 679
 				// 	$row['lat_lng'] = $atts['field_value']['lat_lng'];
@@ -701,18 +701,18 @@  discard block
 block discarded – undo
701 701
 		$echo = 'echo' === self::$mode;
702 702
 
703 703
 		foreach ( self::$headings as $k => $heading ) {
704
-			if ( isset( $rows[ $k ] ) ) {
705
-				$row = $rows[ $k ];
704
+			if ( isset( $rows[$k] ) ) {
705
+				$row = $rows[$k];
706 706
 			} else {
707 707
 				$row = '';
708 708
 				// array indexed data is not at $rows[ $k ]
709
-				if ( $k[ strlen( $k ) - 1 ] === ']' ) {
709
+				if ( $k[strlen( $k ) - 1] === ']' ) {
710 710
 					$start = strrpos( $k, '[' );
711
-					$key   = substr( $k, 0, $start++ );
711
+					$key   = substr( $k, 0, $start ++ );
712 712
 					$index = substr( $k, $start, strlen( $k ) - 1 - $start );
713 713
 
714
-					if ( isset( $rows[ $key ] ) && isset( $rows[ $key ][ $index ] ) ) {
715
-						$row = $rows[ $key ][ $index ];
714
+					if ( isset( $rows[$key] ) && isset( $rows[$key][$index] ) ) {
715
+						$row = $rows[$key][$index];
716 716
 					}
717 717
 
718 718
 					unset( $start, $key, $index );
Please login to merge, or discard this patch.