Completed
Pull Request — master (#330)
by
unknown
02:58
created
classes/helpers/FrmCSVExportHelper.php 1 patch
Spacing   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 		self::print_file_headers( $filename );
42 42
 		unset( $filename );
43 43
 
44
-		$comment_count       = FrmDb::get_count(
44
+		$comment_count = FrmDb::get_count(
45 45
 			'frm_item_metas',
46 46
 			array(
47 47
 				'item_id'         => $atts['entry_ids'],
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 	private static function prepare_csv_headings() {
108 108
 		$headings = array();
109 109
 		self::csv_headings( $headings );
110
-		$headings       = apply_filters(
110
+		$headings = apply_filters(
111 111
 			'frm_csv_columns',
112 112
 			$headings,
113 113
 			self::$form_id,
@@ -124,10 +124,10 @@  discard block
 block discarded – undo
124 124
 		$field_headings  = array();
125 125
 		$separate_values = array( 'user_id', 'file', 'data', 'date' );
126 126
 		if ( isset( $col->field_options['separate_value'] ) && $col->field_options['separate_value'] && ! in_array( $col->type, $separate_values, true ) ) {
127
-			$field_headings[ $col->id . '_label' ] = strip_tags( $col->name . ' ' . __( '(label)', 'formidable' ) );
127
+			$field_headings[$col->id . '_label'] = strip_tags( $col->name . ' ' . __( '(label)', 'formidable' ) );
128 128
 		}
129 129
 
130
-		$field_headings[ $col->id ] = strip_tags( $col->name );
130
+		$field_headings[$col->id] = strip_tags( $col->name );
131 131
 		$field_headings             = apply_filters(
132 132
 			'frm_csv_field_columns',
133 133
 			$field_headings,
@@ -146,14 +146,14 @@  discard block
 block discarded – undo
146 146
 		foreach ( self::$fields as $col ) {
147 147
 			if ( self::is_the_child_of_a_repeater( $col ) ) {
148 148
 				$repeater_id                           = $col->field_options['in_section'];
149
-				$headings[ 'repeater' . $repeater_id ] = array(); // set a placeholder to maintain order for repeater fields
149
+				$headings['repeater' . $repeater_id] = array(); // set a placeholder to maintain order for repeater fields
150 150
 
151
-				if ( ! isset( $fields_by_repeater_id[ $repeater_id ] ) ) {
152
-					$fields_by_repeater_id[ $repeater_id ] = array();
151
+				if ( ! isset( $fields_by_repeater_id[$repeater_id] ) ) {
152
+					$fields_by_repeater_id[$repeater_id] = array();
153 153
 					$repeater_ids[]                        = $repeater_id;
154 154
 				}
155 155
 
156
-				$fields_by_repeater_id[ $repeater_id ][] = $col;
156
+				$fields_by_repeater_id[$repeater_id][] = $col;
157 157
 			} else {
158 158
 				$headings += self::field_headings( $col );
159 159
 			}
@@ -170,8 +170,8 @@  discard block
 block discarded – undo
170 170
 				$end    = strpos( $row->meta_value, ':{' );
171 171
 				$length = substr( $row->meta_value, $start, $end - $start );
172 172
 
173
-				if ( $length > $max[ $row->field_id ] ) {
174
-					$max[ $row->field_id ] = $length;
173
+				if ( $length > $max[$row->field_id] ) {
174
+					$max[$row->field_id] = $length;
175 175
 				}
176 176
 			}
177 177
 			unset( $start, $end, $length, $row, $repeater_meta, $where );
@@ -182,17 +182,17 @@  discard block
 block discarded – undo
182 182
 					$repeater_id = str_replace( 'repeater', '', $key );
183 183
 
184 184
 					$repeater_headings = array();
185
-					foreach ( $fields_by_repeater_id[ $repeater_id ] as $col ) {
185
+					foreach ( $fields_by_repeater_id[$repeater_id] as $col ) {
186 186
 						$repeater_headings += self::field_headings( $col );
187 187
 					}
188 188
 
189
-					for ( $i = 0; $i < $max[ $repeater_id ]; $i ++ ) {
189
+					for ( $i = 0; $i < $max[$repeater_id]; $i ++ ) {
190 190
 						foreach ( $repeater_headings as $repeater_key => $repeater_name ) {
191
-							$flat[ $repeater_key . '[' . $i . ']' ] = $repeater_name;
191
+							$flat[$repeater_key . '[' . $i . ']'] = $repeater_name;
192 192
 						}
193 193
 					}
194 194
 				} else {
195
-					$flat[ $key ] = $heading;
195
+					$flat[$key] = $heading;
196 196
 				}
197 197
 			}
198 198
 
@@ -206,9 +206,9 @@  discard block
 block discarded – undo
206 206
 
207 207
 		if ( self::$comment_count ) {
208 208
 			for ( $i = 0; $i < self::$comment_count; $i ++ ) {
209
-				$headings[ 'comment' . $i ]            = __( 'Comment', 'formidable' );
210
-				$headings[ 'comment_user_id' . $i ]    = __( 'Comment User', 'formidable' );
211
-				$headings[ 'comment_created_at' . $i ] = __( 'Comment Date', 'formidable' );
209
+				$headings['comment' . $i]            = __( 'Comment', 'formidable' );
210
+				$headings['comment_user_id' . $i]    = __( 'Comment User', 'formidable' );
211
+				$headings['comment_created_at' . $i] = __( 'Comment Date', 'formidable' );
212 212
 			}
213 213
 			unset( $i );
214 214
 		}
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 
252 252
 	private static function prepare_next_csv_rows( $next_set ) {
253 253
 		// order by parent_item_id so children will be first
254
-		$where   = array(
254
+		$where = array(
255 255
 			'or'             => 1,
256 256
 			'id'             => $next_set,
257 257
 			'parent_item_id' => $next_set,
@@ -296,32 +296,32 @@  discard block
 block discarded – undo
296 296
 					continue;
297 297
 				}
298 298
 
299
-				if ( ! isset( $entries[ self::$entry->parent_item_id ] ) ) {
300
-					$entries[ self::$entry->parent_item_id ]        = new stdClass();
301
-					$entries[ self::$entry->parent_item_id ]->metas = array();
299
+				if ( ! isset( $entries[self::$entry->parent_item_id] ) ) {
300
+					$entries[self::$entry->parent_item_id]        = new stdClass();
301
+					$entries[self::$entry->parent_item_id]->metas = array();
302 302
 				}
303 303
 
304
-				if ( ! isset( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) {
305
-					$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = array();
306
-				} elseif ( ! is_array( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) {
304
+				if ( ! isset( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) {
305
+					$entries[self::$entry->parent_item_id]->metas[$meta_id] = array();
306
+				} elseif ( ! is_array( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) {
307 307
 					// if the data is here, it should be an array but if this field has collected data
308 308
 					// both while inside and outside of the repeating section, it's possible this is a string
309
-					$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = (array) $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ];
309
+					$entries[self::$entry->parent_item_id]->metas[$meta_id] = (array) $entries[self::$entry->parent_item_id]->metas[$meta_id];
310 310
 				}
311 311
 
312 312
 				//add the repeated values
313
-				$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ][] = $meta_value;
313
+				$entries[self::$entry->parent_item_id]->metas[$meta_id][] = $meta_value;
314 314
 			}
315 315
 
316 316
 			self::$entry->metas                              = self::fill_missing_repeater_metas( self::$entry->metas, $entries );
317
-			$entries[ self::$entry->parent_item_id ]->metas += self::$entry->metas;
317
+			$entries[self::$entry->parent_item_id]->metas += self::$entry->metas;
318 318
 		}
319 319
 
320 320
 		// add the embedded form id
321
-		if ( ! isset( $entries[ self::$entry->parent_item_id ]->embedded_fields ) ) {
322
-			$entries[ self::$entry->parent_item_id ]->embedded_fields = array();
321
+		if ( ! isset( $entries[self::$entry->parent_item_id]->embedded_fields ) ) {
322
+			$entries[self::$entry->parent_item_id]->embedded_fields = array();
323 323
 		}
324
-		$entries[ self::$entry->parent_item_id ]->embedded_fields[ self::$entry->id ] = self::$entry->form_id;
324
+		$entries[self::$entry->parent_item_id]->embedded_fields[self::$entry->id] = self::$entry->form_id;
325 325
 	}
326 326
 
327 327
 	/**
@@ -342,14 +342,14 @@  discard block
 block discarded – undo
342 342
 		}
343 343
 
344 344
 		$repeater_id = $field->field_options['in_section'];
345
-		if ( ! isset( self::$fields_by_repeater_id[ $repeater_id ] ) ) {
345
+		if ( ! isset( self::$fields_by_repeater_id[$repeater_id] ) ) {
346 346
 			return $metas;
347 347
 		}
348 348
 
349
-		foreach ( self::$fields_by_repeater_id[ $repeater_id ] as $repeater_child ) {
350
-			if ( ! isset( $metas[ $repeater_child->id ] ) ) {
351
-				$metas[ $repeater_child->id ]                                            = '';
352
-				$entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ][] = '';
349
+		foreach ( self::$fields_by_repeater_id[$repeater_id] as $repeater_child ) {
350
+			if ( ! isset( $metas[$repeater_child->id] ) ) {
351
+				$metas[$repeater_child->id]                                            = '';
352
+				$entries[self::$entry->parent_item_id]->metas[$repeater_child->id][] = '';
353 353
 			}
354 354
 		}
355 355
 
@@ -368,7 +368,7 @@  discard block
 block discarded – undo
368 368
 
369 369
 	private static function add_field_values_to_csv( &$row ) {
370 370
 		foreach ( self::$fields as $col ) {
371
-			$field_value = isset( self::$entry->metas[ $col->id ] ) ? self::$entry->metas[ $col->id ] : false;
371
+			$field_value = isset( self::$entry->metas[$col->id] ) ? self::$entry->metas[$col->id] : false;
372 372
 
373 373
 			FrmAppHelper::unserialize_or_decode( $field_value );
374 374
 			self::add_array_values_to_columns( $row, compact( 'col', 'field_value' ) );
@@ -393,15 +393,15 @@  discard block
 block discarded – undo
393 393
 						'show_icon'         => false,
394 394
 						'entry_id'          => self::$entry->id,
395 395
 						'sep'               => self::$separator,
396
-						'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,
396
+						'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,
397 397
 					)
398 398
 				);
399 399
 
400
-				$row[ $col->id . '_label' ] = $sep_value;
400
+				$row[$col->id . '_label'] = $sep_value;
401 401
 				unset( $sep_value );
402 402
 			}
403 403
 
404
-			$row[ $col->id ] = $field_value;
404
+			$row[$col->id] = $field_value;
405 405
 
406 406
 			unset( $col, $field_value );
407 407
 		}
@@ -414,8 +414,8 @@  discard block
 block discarded – undo
414 414
 		if ( is_array( $atts['field_value'] ) ) {
415 415
 			foreach ( $atts['field_value'] as $key => $sub_value ) {
416 416
 				$column_key = $atts['col']->id . '_' . $key;
417
-				if ( ! is_numeric( $key ) && isset( self::$headings[ $column_key ] ) ) {
418
-					$row[ $column_key ] = $sub_value;
417
+				if ( ! is_numeric( $key ) && isset( self::$headings[$column_key] ) ) {
418
+					$row[$column_key] = $sub_value;
419 419
 				}
420 420
 			}
421 421
 		}
@@ -439,18 +439,18 @@  discard block
 block discarded – undo
439 439
 		$sep = '';
440 440
 
441 441
 		foreach ( self::$headings as $k => $heading ) {
442
-			if ( isset( $rows[ $k ] ) ) {
443
-				$row = $rows[ $k ];
442
+			if ( isset( $rows[$k] ) ) {
443
+				$row = $rows[$k];
444 444
 			} else {
445 445
 				$row = '';
446 446
 				// array indexed data is not at $rows[ $k ]
447
-				if ( $k[ strlen( $k ) - 1 ] === ']' ) {
447
+				if ( $k[strlen( $k ) - 1] === ']' ) {
448 448
 					$start = strrpos( $k, '[' );
449 449
 					$key   = substr( $k, 0, $start ++ );
450 450
 					$index = substr( $k, $start, strlen( $k ) - 1 - $start );
451 451
 
452
-					if ( isset( $rows[ $key ] ) && isset( $rows[ $key ][ $index ] ) ) {
453
-						$row = $rows[ $key ][ $index ];
452
+					if ( isset( $rows[$key] ) && isset( $rows[$key][$index] ) ) {
453
+						$row = $rows[$key][$index];
454 454
 					}
455 455
 
456 456
 					unset( $start, $key, $index );
Please login to merge, or discard this patch.