Completed
Pull Request — master (#2204)
by
unknown
35s
created
classes/helpers/FrmCSVExportHelper.php 1 patch
Spacing   +54 added lines, -54 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 
129 129
 		unset( $filename );
130 130
 
131
-		$comment_count       = FrmDb::get_count(
131
+		$comment_count = FrmDb::get_count(
132 132
 			'frm_item_metas',
133 133
 			array(
134 134
 				'item_id'         => $atts['entry_ids'],
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
 	private static function prepare_csv_headings() {
260 260
 		$headings = array();
261 261
 		self::csv_headings( $headings );
262
-		$headings       = apply_filters(
262
+		$headings = apply_filters(
263 263
 			'frm_csv_columns',
264 264
 			$headings,
265 265
 			self::$form_id,
@@ -283,10 +283,10 @@  discard block
 block discarded – undo
283 283
 		$field_headings  = array();
284 284
 		$separate_values = array( 'user_id', 'file', 'data', 'date' );
285 285
 		if ( ! empty( $col->field_options['separate_value'] ) && ! in_array( $col->type, $separate_values, true ) ) {
286
-			$field_headings[ $col->id . '_label' ] = strip_tags( $col->name . ' ' . __( '(label)', 'formidable' ) );
286
+			$field_headings[$col->id . '_label'] = strip_tags( $col->name . ' ' . __( '(label)', 'formidable' ) );
287 287
 		}
288 288
 
289
-		$field_headings[ $col->id ] = strip_tags( $col->name );
289
+		$field_headings[$col->id] = strip_tags( $col->name );
290 290
 		$field_headings             = apply_filters(
291 291
 			'frm_csv_field_columns',
292 292
 			$field_headings,
@@ -307,14 +307,14 @@  discard block
 block discarded – undo
307 307
 			if ( self::is_the_child_of_a_repeater( $col ) ) {
308 308
 				$repeater_id = $col->field_options['in_section'];
309 309
 				// Set a placeholder to maintain order for repeater fields.
310
-				$headings[ 'repeater' . $repeater_id ] = array();
310
+				$headings['repeater' . $repeater_id] = array();
311 311
 
312
-				if ( ! isset( $fields_by_repeater_id[ $repeater_id ] ) ) {
313
-					$fields_by_repeater_id[ $repeater_id ] = array();
312
+				if ( ! isset( $fields_by_repeater_id[$repeater_id] ) ) {
313
+					$fields_by_repeater_id[$repeater_id] = array();
314 314
 					$repeater_ids[]                        = $repeater_id;
315 315
 				}
316 316
 
317
-				$fields_by_repeater_id[ $repeater_id ][] = $col;
317
+				$fields_by_repeater_id[$repeater_id][] = $col;
318 318
 
319 319
 				continue;
320 320
 			}
@@ -333,8 +333,8 @@  discard block
 block discarded – undo
333 333
 				$end    = strpos( $row->meta_value, ':{' );
334 334
 				$length = substr( $row->meta_value, $start, $end - $start );
335 335
 
336
-				if ( $length > $max[ $row->field_id ] ) {
337
-					$max[ $row->field_id ] = $length;
336
+				if ( $length > $max[$row->field_id] ) {
337
+					$max[$row->field_id] = $length;
338 338
 				}
339 339
 			}
340 340
 			unset( $start, $end, $length, $row, $repeater_meta, $where );
@@ -345,17 +345,17 @@  discard block
 block discarded – undo
345 345
 					$repeater_id = str_replace( 'repeater', '', $key );
346 346
 
347 347
 					$repeater_headings = array();
348
-					foreach ( $fields_by_repeater_id[ $repeater_id ] as $col ) {
348
+					foreach ( $fields_by_repeater_id[$repeater_id] as $col ) {
349 349
 						$repeater_headings += self::field_headings( $col );
350 350
 					}
351 351
 
352
-					for ( $i = 0; $i < $max[ $repeater_id ]; $i++ ) {
352
+					for ( $i = 0; $i < $max[$repeater_id]; $i ++ ) {
353 353
 						foreach ( $repeater_headings as $repeater_key => $repeater_name ) {
354
-							$flat[ $repeater_key . '[' . $i . ']' ] = $repeater_name;
354
+							$flat[$repeater_key . '[' . $i . ']'] = $repeater_name;
355 355
 						}
356 356
 					}
357 357
 				} else {
358
-					$flat[ $key ] = $heading;
358
+					$flat[$key] = $heading;
359 359
 				}
360 360
 			}
361 361
 
@@ -368,10 +368,10 @@  discard block
 block discarded – undo
368 368
 		}//end if
369 369
 
370 370
 		if ( self::$comment_count ) {
371
-			for ( $i = 0; $i < self::$comment_count; $i++ ) {
372
-				$headings[ 'comment' . $i ]            = __( 'Comment', 'formidable' );
373
-				$headings[ 'comment_user_id' . $i ]    = __( 'Comment User', 'formidable' );
374
-				$headings[ 'comment_created_at' . $i ] = __( 'Comment Date', 'formidable' );
371
+			for ( $i = 0; $i < self::$comment_count; $i ++ ) {
372
+				$headings['comment' . $i]            = __( 'Comment', 'formidable' );
373
+				$headings['comment_user_id' . $i]    = __( 'Comment User', 'formidable' );
374
+				$headings['comment_created_at' . $i] = __( 'Comment Date', 'formidable' );
375 375
 			}
376 376
 			unset( $i );
377 377
 		}
@@ -417,7 +417,7 @@  discard block
 block discarded – undo
417 417
 	private static function prepare_next_csv_rows( $next_set ) {
418 418
 		if ( FrmAppHelper::pro_is_installed() ) {
419 419
 			// Order by parent_item_id so children will be first.
420
-			$where    = array(
420
+			$where = array(
421 421
 				'or'             => 1,
422 422
 				'id'             => $next_set,
423 423
 				'parent_item_id' => $next_set,
@@ -473,32 +473,32 @@  discard block
 block discarded – undo
473 473
 					continue;
474 474
 				}
475 475
 
476
-				if ( ! isset( $entries[ self::$entry->parent_item_id ] ) ) {
477
-					$entries[ self::$entry->parent_item_id ]        = new stdClass();
478
-					$entries[ self::$entry->parent_item_id ]->metas = array();
476
+				if ( ! isset( $entries[self::$entry->parent_item_id] ) ) {
477
+					$entries[self::$entry->parent_item_id]        = new stdClass();
478
+					$entries[self::$entry->parent_item_id]->metas = array();
479 479
 				}
480 480
 
481
-				if ( ! isset( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) {
482
-					$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = array();
483
-				} elseif ( ! is_array( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) {
481
+				if ( ! isset( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) {
482
+					$entries[self::$entry->parent_item_id]->metas[$meta_id] = array();
483
+				} elseif ( ! is_array( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) {
484 484
 					// if the data is here, it should be an array but if this field has collected data
485 485
 					// both while inside and outside of the repeating section, it's possible this is a string.
486
-					$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = (array) $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ];
486
+					$entries[self::$entry->parent_item_id]->metas[$meta_id] = (array) $entries[self::$entry->parent_item_id]->metas[$meta_id];
487 487
 				}
488 488
 
489 489
 				// Add the repeated values.
490
-				$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ][] = $meta_value;
490
+				$entries[self::$entry->parent_item_id]->metas[$meta_id][] = $meta_value;
491 491
 			}//end foreach
492 492
 
493 493
 			self::$entry->metas                              = self::fill_missing_repeater_metas( self::$entry->metas, $entries );
494
-			$entries[ self::$entry->parent_item_id ]->metas += self::$entry->metas;
494
+			$entries[self::$entry->parent_item_id]->metas += self::$entry->metas;
495 495
 		}//end if
496 496
 
497 497
 		// add the embedded form id
498
-		if ( ! isset( $entries[ self::$entry->parent_item_id ]->embedded_fields ) ) {
499
-			$entries[ self::$entry->parent_item_id ]->embedded_fields = array();
498
+		if ( ! isset( $entries[self::$entry->parent_item_id]->embedded_fields ) ) {
499
+			$entries[self::$entry->parent_item_id]->embedded_fields = array();
500 500
 		}
501
-		$entries[ self::$entry->parent_item_id ]->embedded_fields[ self::$entry->id ] = self::$entry->form_id;
501
+		$entries[self::$entry->parent_item_id]->embedded_fields[self::$entry->id] = self::$entry->form_id;
502 502
 	}
503 503
 
504 504
 	/**
@@ -519,19 +519,19 @@  discard block
 block discarded – undo
519 519
 		}
520 520
 
521 521
 		$repeater_id = $field->field_options['in_section'];
522
-		if ( ! isset( self::$fields_by_repeater_id[ $repeater_id ] ) ) {
522
+		if ( ! isset( self::$fields_by_repeater_id[$repeater_id] ) ) {
523 523
 			return $metas;
524 524
 		}
525 525
 
526
-		foreach ( self::$fields_by_repeater_id[ $repeater_id ] as $repeater_child ) {
527
-			if ( ! isset( $metas[ $repeater_child->id ] ) ) {
528
-				$metas[ $repeater_child->id ] = '';
526
+		foreach ( self::$fields_by_repeater_id[$repeater_id] as $repeater_child ) {
527
+			if ( ! isset( $metas[$repeater_child->id] ) ) {
528
+				$metas[$repeater_child->id] = '';
529 529
 
530
-				if ( ! isset( $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] ) || ! is_array( $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] ) ) {
531
-					$entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] = array();
530
+				if ( ! isset( $entries[self::$entry->parent_item_id]->metas[$repeater_child->id] ) || ! is_array( $entries[self::$entry->parent_item_id]->metas[$repeater_child->id] ) ) {
531
+					$entries[self::$entry->parent_item_id]->metas[$repeater_child->id] = array();
532 532
 				}
533 533
 
534
-				$entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ][] = '';
534
+				$entries[self::$entry->parent_item_id]->metas[$repeater_child->id][] = '';
535 535
 			}
536 536
 		}
537 537
 
@@ -550,7 +550,7 @@  discard block
 block discarded – undo
550 550
 
551 551
 	private static function add_field_values_to_csv( &$row ) {
552 552
 		foreach ( self::$fields as $col ) {
553
-			$field_value = isset( self::$entry->metas[ $col->id ] ) ? self::$entry->metas[ $col->id ] : false;
553
+			$field_value = isset( self::$entry->metas[$col->id] ) ? self::$entry->metas[$col->id] : false;
554 554
 
555 555
 			FrmFieldsHelper::prepare_field_value( $field_value, $col->type );
556 556
 			self::add_array_values_to_columns( $row, compact( 'col', 'field_value' ) );
@@ -569,20 +569,20 @@  discard block
 block discarded – undo
569 569
 			if ( ! empty( $col->field_options['separate_value'] ) ) {
570 570
 				$label_key = $col->id . '_label';
571 571
 				if ( self::is_the_child_of_a_repeater( $col ) ) {
572
-					$row[ $label_key ] = array();
572
+					$row[$label_key] = array();
573 573
 
574 574
 					if ( is_array( $field_value ) ) {
575 575
 						foreach ( $field_value as $value ) {
576
-							$row[ $label_key ][] = self::get_separate_value_label( $value, $col );
576
+							$row[$label_key][] = self::get_separate_value_label( $value, $col );
577 577
 						}
578 578
 					}
579 579
 				} else {
580
-					$row[ $label_key ] = self::get_separate_value_label( $field_value, $col );
580
+					$row[$label_key] = self::get_separate_value_label( $field_value, $col );
581 581
 				}
582 582
 				unset( $label_key );
583 583
 			}
584 584
 
585
-			$row[ $col->id ] = $field_value;
585
+			$row[$col->id] = $field_value;
586 586
 
587 587
 			unset( $col, $field_value );
588 588
 		}//end foreach
@@ -605,7 +605,7 @@  discard block
 block discarded – undo
605 605
 				'show_icon'         => false,
606 606
 				'entry_id'          => self::$entry->id,
607 607
 				'sep'               => self::$separator,
608
-				'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,
608
+				'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,
609 609
 			)
610 610
 		);
611 611
 	}
@@ -620,8 +620,8 @@  discard block
 block discarded – undo
620 620
 					// This is combo field inside repeater. The heading key has this format: [86_first[0]].
621 621
 					foreach ( $sub_value as $sub_key => $sub_sub_value ) {
622 622
 						$column_key = $atts['col']->id . '_' . $sub_key . '[' . $key . ']';
623
-						if ( ! is_numeric( $sub_key ) && isset( self::$headings[ $column_key ] ) ) {
624
-							$row[ $column_key ] = $sub_sub_value;
623
+						if ( ! is_numeric( $sub_key ) && isset( self::$headings[$column_key] ) ) {
624
+							$row[$column_key] = $sub_sub_value;
625 625
 						}
626 626
 					}
627 627
 
@@ -629,8 +629,8 @@  discard block
 block discarded – undo
629 629
 				}
630 630
 
631 631
 				$column_key = $atts['col']->id . '_' . $key;
632
-				if ( ! is_numeric( $key ) && isset( self::$headings[ $column_key ] ) ) {
633
-					$row[ $column_key ] = $sub_value;
632
+				if ( ! is_numeric( $key ) && isset( self::$headings[$column_key] ) ) {
633
+					$row[$column_key] = $sub_value;
634 634
 				}
635 635
 			}
636 636
 		}
@@ -655,18 +655,18 @@  discard block
 block discarded – undo
655 655
 		$echo = 'echo' === self::$mode;
656 656
 
657 657
 		foreach ( self::$headings as $k => $heading ) {
658
-			if ( isset( $rows[ $k ] ) ) {
659
-				$row = $rows[ $k ];
658
+			if ( isset( $rows[$k] ) ) {
659
+				$row = $rows[$k];
660 660
 			} else {
661 661
 				$row = '';
662 662
 				// array indexed data is not at $rows[ $k ]
663
-				if ( $k[ strlen( $k ) - 1 ] === ']' ) {
663
+				if ( $k[strlen( $k ) - 1] === ']' ) {
664 664
 					$start = strrpos( $k, '[' );
665
-					$key   = substr( $k, 0, $start++ );
665
+					$key   = substr( $k, 0, $start ++ );
666 666
 					$index = substr( $k, $start, strlen( $k ) - 1 - $start );
667 667
 
668
-					if ( isset( $rows[ $key ] ) && isset( $rows[ $key ][ $index ] ) ) {
669
-						$row = $rows[ $key ][ $index ];
668
+					if ( isset( $rows[$key] ) && isset( $rows[$key][$index] ) ) {
669
+						$row = $rows[$key][$index];
670 670
 					}
671 671
 
672 672
 					unset( $start, $key, $index );
Please login to merge, or discard this patch.