@@ -147,20 +147,20 @@ discard block |
||
| 147 | 147 | global $frm_vars; |
| 148 | 148 | $form_id = FrmForm::get_current_form_id(); |
| 149 | 149 | |
| 150 | - $columns[ $form_id . '_id' ] = 'ID'; |
|
| 151 | - $columns[ $form_id . '_item_key' ] = esc_html__( 'Entry Key', 'formidable' ); |
|
| 150 | + $columns[$form_id . '_id'] = 'ID'; |
|
| 151 | + $columns[$form_id . '_item_key'] = esc_html__( 'Entry Key', 'formidable' ); |
|
| 152 | 152 | |
| 153 | 153 | if ( $form_id ) { |
| 154 | 154 | self::get_columns_for_form( $form_id, $columns ); |
| 155 | 155 | } else { |
| 156 | - $columns[ $form_id . '_form_id' ] = esc_html__( 'Form', 'formidable' ); |
|
| 157 | - $columns[ $form_id . '_name' ] = esc_html__( 'Entry Name', 'formidable' ); |
|
| 158 | - $columns[ $form_id . '_user_id' ] = esc_html__( 'Created By', 'formidable' ); |
|
| 156 | + $columns[$form_id . '_form_id'] = esc_html__( 'Form', 'formidable' ); |
|
| 157 | + $columns[$form_id . '_name'] = esc_html__( 'Entry Name', 'formidable' ); |
|
| 158 | + $columns[$form_id . '_user_id'] = esc_html__( 'Created By', 'formidable' ); |
|
| 159 | 159 | } |
| 160 | 160 | |
| 161 | - $columns[ $form_id . '_is_draft' ] = esc_html__( 'Entry Status', 'formidable' ); |
|
| 162 | - $columns[ $form_id . '_created_at' ] = __( 'Entry creation date', 'formidable' ); |
|
| 163 | - $columns[ $form_id . '_updated_at' ] = __( 'Entry update date', 'formidable' ); |
|
| 161 | + $columns[$form_id . '_is_draft'] = esc_html__( 'Entry Status', 'formidable' ); |
|
| 162 | + $columns[$form_id . '_created_at'] = __( 'Entry creation date', 'formidable' ); |
|
| 163 | + $columns[$form_id . '_updated_at'] = __( 'Entry update date', 'formidable' ); |
|
| 164 | 164 | self::maybe_add_ip_col( $form_id, $columns ); |
| 165 | 165 | |
| 166 | 166 | $frm_vars['cols'] = $columns; |
@@ -218,10 +218,10 @@ discard block |
||
| 218 | 218 | |
| 219 | 219 | foreach ( $sub_form_cols as $k => $sub_form_col ) { |
| 220 | 220 | if ( FrmField::is_no_save_field( $sub_form_col->type ) ) { |
| 221 | - unset( $sub_form_cols[ $k ] ); |
|
| 221 | + unset( $sub_form_cols[$k] ); |
|
| 222 | 222 | continue; |
| 223 | 223 | } |
| 224 | - $columns[ $form_id . '_' . $sub_form_col->field_key . '-_-' . $field->id ] = FrmAppHelper::truncate( $sub_form_col->name, 35 ); |
|
| 224 | + $columns[$form_id . '_' . $sub_form_col->field_key . '-_-' . $field->id] = FrmAppHelper::truncate( $sub_form_col->name, 35 ); |
|
| 225 | 225 | unset( $sub_form_col ); |
| 226 | 226 | } |
| 227 | 227 | } |
@@ -239,10 +239,10 @@ discard block |
||
| 239 | 239 | $is_post_status = FrmField::is_option_true( $field, 'post_field' ) && $field->field_options['post_field'] === 'post_status'; |
| 240 | 240 | $include_column_for_sep_val = $has_separate_value && ! $is_post_status; |
| 241 | 241 | if ( $include_column_for_sep_val ) { |
| 242 | - $columns[ $form_id . '_frmsep_' . $col_id ] = self::maybe_format_field_name_for_column_title( $field, $include_column_for_sep_val ); |
|
| 242 | + $columns[$form_id . '_frmsep_' . $col_id] = self::maybe_format_field_name_for_column_title( $field, $include_column_for_sep_val ); |
|
| 243 | 243 | } |
| 244 | 244 | |
| 245 | - $columns[ $form_id . '_' . $col_id ] = self::maybe_format_field_name_for_column_title( $field, $include_column_for_sep_val, false ); |
|
| 245 | + $columns[$form_id . '_' . $col_id] = self::maybe_format_field_name_for_column_title( $field, $include_column_for_sep_val, false ); |
|
| 246 | 246 | } |
| 247 | 247 | |
| 248 | 248 | /** |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | |
| 269 | 269 | private static function maybe_add_ip_col( $form_id, &$columns ) { |
| 270 | 270 | if ( FrmAppHelper::ips_saved() ) { |
| 271 | - $columns[ $form_id . '_ip' ] = 'IP'; |
|
| 271 | + $columns[$form_id . '_ip'] = 'IP'; |
|
| 272 | 272 | } |
| 273 | 273 | } |
| 274 | 274 | |
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | foreach ( $meta_value as $mk => $mv ) { |
| 308 | 308 | // Remove blank values. |
| 309 | 309 | if ( empty( $mv ) ) { |
| 310 | - unset( $meta_value[ $mk ] ); |
|
| 310 | + unset( $meta_value[$mk] ); |
|
| 311 | 311 | } |
| 312 | 312 | } |
| 313 | 313 | |
@@ -384,14 +384,14 @@ discard block |
||
| 384 | 384 | ); |
| 385 | 385 | |
| 386 | 386 | if ( ! $form_id ) { |
| 387 | - $columns[ $form_id . '_user_id' ] = 'user_id'; |
|
| 388 | - $columns[ $form_id . '_name' ] = 'name'; |
|
| 389 | - $columns[ $form_id . '_form_id' ] = 'form_id'; |
|
| 387 | + $columns[$form_id . '_user_id'] = 'user_id'; |
|
| 388 | + $columns[$form_id . '_name'] = 'name'; |
|
| 389 | + $columns[$form_id . '_form_id'] = 'form_id'; |
|
| 390 | 390 | } |
| 391 | 391 | |
| 392 | 392 | foreach ( $fields as $field ) { |
| 393 | 393 | if ( self::field_supports_sorting( $field ) ) { |
| 394 | - $columns[ $form_id . '_' . $field->field_key ] = 'meta_' . $field->id; |
|
| 394 | + $columns[$form_id . '_' . $field->field_key] = 'meta_' . $field->id; |
|
| 395 | 395 | } |
| 396 | 396 | } |
| 397 | 397 | |
@@ -478,7 +478,7 @@ discard block |
||
| 478 | 478 | $atts['form_id'] . '_item_key' => '', |
| 479 | 479 | $atts['form_id'] . '_id' => '', |
| 480 | 480 | ); |
| 481 | - $cols = $remove_first + array_reverse( $frm_vars['cols'], true ); |
|
| 481 | + $cols = $remove_first + array_reverse( $frm_vars['cols'], true ); |
|
| 482 | 482 | |
| 483 | 483 | $i = $atts['i']; |
| 484 | 484 | |
@@ -489,7 +489,7 @@ discard block |
||
| 489 | 489 | |
| 490 | 490 | if ( empty( $result ) || ! in_array( $col_key, $result, true ) ) { |
| 491 | 491 | $result[] = $col_key; |
| 492 | - --$i; |
|
| 492 | + -- $i; |
|
| 493 | 493 | } |
| 494 | 494 | |
| 495 | 495 | unset( $col_key, $col ); |
@@ -637,9 +637,9 @@ discard block |
||
| 637 | 637 | if ( ! isset( $frm_vars['form_params'] ) ) { |
| 638 | 638 | $frm_vars['form_params'] = array(); |
| 639 | 639 | } |
| 640 | - $frm_vars['form_params'][ $form->id ] = $params; |
|
| 640 | + $frm_vars['form_params'][$form->id] = $params; |
|
| 641 | 641 | |
| 642 | - if ( isset( $frm_vars['created_entries'][ $form_id ] ) ) { |
|
| 642 | + if ( isset( $frm_vars['created_entries'][$form_id] ) ) { |
|
| 643 | 643 | return; |
| 644 | 644 | } |
| 645 | 645 | |
@@ -655,16 +655,16 @@ discard block |
||
| 655 | 655 | */ |
| 656 | 656 | $errors = apply_filters( 'frm_entries_before_create', $errors, $form ); |
| 657 | 657 | |
| 658 | - $frm_vars['created_entries'][ $form_id ] = array( 'errors' => $errors ); |
|
| 658 | + $frm_vars['created_entries'][$form_id] = array( 'errors' => $errors ); |
|
| 659 | 659 | |
| 660 | 660 | if ( empty( $errors ) ) { |
| 661 | 661 | $_POST['frm_skip_cookie'] = 1; |
| 662 | 662 | $do_success = false; |
| 663 | 663 | if ( $params['action'] === 'create' ) { |
| 664 | - if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) { |
|
| 665 | - $frm_vars['created_entries'][ $form_id ]['entry_id'] = FrmEntry::create( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing |
|
| 664 | + if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][$form_id]['entry_id'] ) ) { |
|
| 665 | + $frm_vars['created_entries'][$form_id]['entry_id'] = FrmEntry::create( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing |
|
| 666 | 666 | |
| 667 | - $params['id'] = $frm_vars['created_entries'][ $form_id ]['entry_id']; |
|
| 667 | + $params['id'] = $frm_vars['created_entries'][$form_id]['entry_id']; |
|
| 668 | 668 | $do_success = true; |
| 669 | 669 | } |
| 670 | 670 | } |
@@ -154,7 +154,7 @@ discard block |
||
| 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 |
||
| 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,15 +324,15 @@ discard block |
||
| 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 | - if ( ! empty( $field_headings[ $col->id . '_label' ] ) ) { |
|
| 331 | - $field_headings[ $col->id ] = strip_tags( $col->name . ' ' . __( '(value)', 'formidable' ) ); |
|
| 330 | + if ( ! empty( $field_headings[$col->id . '_label'] ) ) { |
|
| 331 | + $field_headings[$col->id] = strip_tags( $col->name . ' ' . __( '(value)', 'formidable' ) ); |
|
| 332 | 332 | } else { |
| 333 | - $field_headings[ $col->id ] = strip_tags( $col->name ); |
|
| 333 | + $field_headings[$col->id] = strip_tags( $col->name ); |
|
| 334 | 334 | } |
| 335 | - $field_headings = apply_filters( |
|
| 335 | + $field_headings = apply_filters( |
|
| 336 | 336 | 'frm_csv_field_columns', |
| 337 | 337 | $field_headings, |
| 338 | 338 | array_merge( |
@@ -352,14 +352,14 @@ discard block |
||
| 352 | 352 | if ( self::is_the_child_of_a_repeater( $col ) ) { |
| 353 | 353 | $repeater_id = $col->field_options['in_section']; |
| 354 | 354 | // Set a placeholder to maintain order for repeater fields. |
| 355 | - $headings[ 'repeater' . $repeater_id ] = array(); |
|
| 355 | + $headings['repeater' . $repeater_id] = array(); |
|
| 356 | 356 | |
| 357 | - if ( ! isset( $fields_by_repeater_id[ $repeater_id ] ) ) { |
|
| 358 | - $fields_by_repeater_id[ $repeater_id ] = array(); |
|
| 357 | + if ( ! isset( $fields_by_repeater_id[$repeater_id] ) ) { |
|
| 358 | + $fields_by_repeater_id[$repeater_id] = array(); |
|
| 359 | 359 | $repeater_ids[] = $repeater_id; |
| 360 | 360 | } |
| 361 | 361 | |
| 362 | - $fields_by_repeater_id[ $repeater_id ][] = $col; |
|
| 362 | + $fields_by_repeater_id[$repeater_id][] = $col; |
|
| 363 | 363 | |
| 364 | 364 | continue; |
| 365 | 365 | } |
@@ -378,8 +378,8 @@ discard block |
||
| 378 | 378 | $end = strpos( $row->meta_value, ':{' ); |
| 379 | 379 | $length = substr( $row->meta_value, $start, $end - $start ); |
| 380 | 380 | |
| 381 | - if ( $length > $max[ $row->field_id ] ) { |
|
| 382 | - $max[ $row->field_id ] = $length; |
|
| 381 | + if ( $length > $max[$row->field_id] ) { |
|
| 382 | + $max[$row->field_id] = $length; |
|
| 383 | 383 | } |
| 384 | 384 | } |
| 385 | 385 | unset( $start, $end, $length, $row, $repeater_meta, $where ); |
@@ -390,17 +390,17 @@ discard block |
||
| 390 | 390 | $repeater_id = str_replace( 'repeater', '', $key ); |
| 391 | 391 | |
| 392 | 392 | $repeater_headings = array(); |
| 393 | - foreach ( $fields_by_repeater_id[ $repeater_id ] as $col ) { |
|
| 393 | + foreach ( $fields_by_repeater_id[$repeater_id] as $col ) { |
|
| 394 | 394 | $repeater_headings += self::field_headings( $col ); |
| 395 | 395 | } |
| 396 | 396 | |
| 397 | - for ( $i = 0; $i < $max[ $repeater_id ]; $i++ ) { |
|
| 397 | + for ( $i = 0; $i < $max[$repeater_id]; $i ++ ) { |
|
| 398 | 398 | foreach ( $repeater_headings as $repeater_key => $repeater_name ) { |
| 399 | - $flat[ $repeater_key . '[' . $i . ']' ] = $repeater_name; |
|
| 399 | + $flat[$repeater_key . '[' . $i . ']'] = $repeater_name; |
|
| 400 | 400 | } |
| 401 | 401 | } |
| 402 | 402 | } else { |
| 403 | - $flat[ $key ] = $heading; |
|
| 403 | + $flat[$key] = $heading; |
|
| 404 | 404 | } |
| 405 | 405 | } |
| 406 | 406 | |
@@ -413,10 +413,10 @@ discard block |
||
| 413 | 413 | }//end if |
| 414 | 414 | |
| 415 | 415 | if ( self::$comment_count ) { |
| 416 | - for ( $i = 0; $i < self::$comment_count; $i++ ) { |
|
| 417 | - $headings[ 'comment' . $i ] = __( 'Comment', 'formidable' ); |
|
| 418 | - $headings[ 'comment_user_id' . $i ] = __( 'Comment User', 'formidable' ); |
|
| 419 | - $headings[ 'comment_created_at' . $i ] = __( 'Comment Date', 'formidable' ); |
|
| 416 | + for ( $i = 0; $i < self::$comment_count; $i ++ ) { |
|
| 417 | + $headings['comment' . $i] = __( 'Comment', 'formidable' ); |
|
| 418 | + $headings['comment_user_id' . $i] = __( 'Comment User', 'formidable' ); |
|
| 419 | + $headings['comment_created_at' . $i] = __( 'Comment Date', 'formidable' ); |
|
| 420 | 420 | } |
| 421 | 421 | unset( $i ); |
| 422 | 422 | } |
@@ -461,7 +461,7 @@ discard block |
||
| 461 | 461 | |
| 462 | 462 | private static function prepare_next_csv_rows( $next_set ) { |
| 463 | 463 | if ( FrmAppHelper::pro_is_installed() ) { |
| 464 | - $where = array( |
|
| 464 | + $where = array( |
|
| 465 | 465 | 'or' => 1, |
| 466 | 466 | 'id' => $next_set, |
| 467 | 467 | 'parent_item_id' => $next_set, |
@@ -518,32 +518,32 @@ discard block |
||
| 518 | 518 | continue; |
| 519 | 519 | } |
| 520 | 520 | |
| 521 | - if ( ! isset( $entries[ self::$entry->parent_item_id ] ) ) { |
|
| 522 | - $entries[ self::$entry->parent_item_id ] = new stdClass(); |
|
| 523 | - $entries[ self::$entry->parent_item_id ]->metas = array(); |
|
| 521 | + if ( ! isset( $entries[self::$entry->parent_item_id] ) ) { |
|
| 522 | + $entries[self::$entry->parent_item_id] = new stdClass(); |
|
| 523 | + $entries[self::$entry->parent_item_id]->metas = array(); |
|
| 524 | 524 | } |
| 525 | 525 | |
| 526 | - if ( ! isset( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) { |
|
| 527 | - $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = array(); |
|
| 528 | - } elseif ( ! is_array( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) { |
|
| 526 | + if ( ! isset( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) { |
|
| 527 | + $entries[self::$entry->parent_item_id]->metas[$meta_id] = array(); |
|
| 528 | + } elseif ( ! is_array( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) { |
|
| 529 | 529 | // if the data is here, it should be an array but if this field has collected data |
| 530 | 530 | // both while inside and outside of the repeating section, it's possible this is a string. |
| 531 | - $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = (array) $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ]; |
|
| 531 | + $entries[self::$entry->parent_item_id]->metas[$meta_id] = (array) $entries[self::$entry->parent_item_id]->metas[$meta_id]; |
|
| 532 | 532 | } |
| 533 | 533 | |
| 534 | 534 | // Add the repeated values. |
| 535 | - $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ][] = $meta_value; |
|
| 535 | + $entries[self::$entry->parent_item_id]->metas[$meta_id][] = $meta_value; |
|
| 536 | 536 | }//end foreach |
| 537 | 537 | |
| 538 | 538 | self::$entry->metas = self::fill_missing_repeater_metas( self::$entry->metas, $entries ); |
| 539 | - $entries[ self::$entry->parent_item_id ]->metas += self::$entry->metas; |
|
| 539 | + $entries[self::$entry->parent_item_id]->metas += self::$entry->metas; |
|
| 540 | 540 | }//end if |
| 541 | 541 | |
| 542 | 542 | // add the embedded form id |
| 543 | - if ( ! isset( $entries[ self::$entry->parent_item_id ]->embedded_fields ) ) { |
|
| 544 | - $entries[ self::$entry->parent_item_id ]->embedded_fields = array(); |
|
| 543 | + if ( ! isset( $entries[self::$entry->parent_item_id]->embedded_fields ) ) { |
|
| 544 | + $entries[self::$entry->parent_item_id]->embedded_fields = array(); |
|
| 545 | 545 | } |
| 546 | - $entries[ self::$entry->parent_item_id ]->embedded_fields[ self::$entry->id ] = self::$entry->form_id; |
|
| 546 | + $entries[self::$entry->parent_item_id]->embedded_fields[self::$entry->id] = self::$entry->form_id; |
|
| 547 | 547 | } |
| 548 | 548 | |
| 549 | 549 | /** |
@@ -564,19 +564,19 @@ discard block |
||
| 564 | 564 | } |
| 565 | 565 | |
| 566 | 566 | $repeater_id = $field->field_options['in_section']; |
| 567 | - if ( ! isset( self::$fields_by_repeater_id[ $repeater_id ] ) ) { |
|
| 567 | + if ( ! isset( self::$fields_by_repeater_id[$repeater_id] ) ) { |
|
| 568 | 568 | return $metas; |
| 569 | 569 | } |
| 570 | 570 | |
| 571 | - foreach ( self::$fields_by_repeater_id[ $repeater_id ] as $repeater_child ) { |
|
| 572 | - if ( ! isset( $metas[ $repeater_child->id ] ) ) { |
|
| 573 | - $metas[ $repeater_child->id ] = ''; |
|
| 571 | + foreach ( self::$fields_by_repeater_id[$repeater_id] as $repeater_child ) { |
|
| 572 | + if ( ! isset( $metas[$repeater_child->id] ) ) { |
|
| 573 | + $metas[$repeater_child->id] = ''; |
|
| 574 | 574 | |
| 575 | - if ( ! isset( $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] ) || ! is_array( $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] ) ) { |
|
| 576 | - $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] = array(); |
|
| 575 | + if ( ! isset( $entries[self::$entry->parent_item_id]->metas[$repeater_child->id] ) || ! is_array( $entries[self::$entry->parent_item_id]->metas[$repeater_child->id] ) ) { |
|
| 576 | + $entries[self::$entry->parent_item_id]->metas[$repeater_child->id] = array(); |
|
| 577 | 577 | } |
| 578 | 578 | |
| 579 | - $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ][] = ''; |
|
| 579 | + $entries[self::$entry->parent_item_id]->metas[$repeater_child->id][] = ''; |
|
| 580 | 580 | } |
| 581 | 581 | } |
| 582 | 582 | |
@@ -595,7 +595,7 @@ discard block |
||
| 595 | 595 | |
| 596 | 596 | private static function add_field_values_to_csv( &$row ) { |
| 597 | 597 | foreach ( self::$fields as $col ) { |
| 598 | - $field_value = self::$entry->metas[ $col->id ] ?? false; |
|
| 598 | + $field_value = self::$entry->metas[$col->id] ?? false; |
|
| 599 | 599 | |
| 600 | 600 | FrmFieldsHelper::prepare_field_value( $field_value, $col->type ); |
| 601 | 601 | self::add_array_values_to_columns( $row, compact( 'col', 'field_value' ) ); |
@@ -614,20 +614,20 @@ discard block |
||
| 614 | 614 | if ( ! empty( $col->field_options['separate_value'] ) ) { |
| 615 | 615 | $label_key = $col->id . '_label'; |
| 616 | 616 | if ( self::is_the_child_of_a_repeater( $col ) ) { |
| 617 | - $row[ $label_key ] = array(); |
|
| 617 | + $row[$label_key] = array(); |
|
| 618 | 618 | |
| 619 | 619 | if ( is_array( $field_value ) ) { |
| 620 | 620 | foreach ( $field_value as $value ) { |
| 621 | - $row[ $label_key ][] = self::get_separate_value_label( $value, $col ); |
|
| 621 | + $row[$label_key][] = self::get_separate_value_label( $value, $col ); |
|
| 622 | 622 | } |
| 623 | 623 | } |
| 624 | 624 | } else { |
| 625 | - $row[ $label_key ] = self::get_separate_value_label( $field_value, $col ); |
|
| 625 | + $row[$label_key] = self::get_separate_value_label( $field_value, $col ); |
|
| 626 | 626 | } |
| 627 | 627 | unset( $label_key ); |
| 628 | 628 | } |
| 629 | 629 | |
| 630 | - $row[ $col->id ] = $field_value; |
|
| 630 | + $row[$col->id] = $field_value; |
|
| 631 | 631 | |
| 632 | 632 | unset( $col, $field_value ); |
| 633 | 633 | }//end foreach |
@@ -650,7 +650,7 @@ discard block |
||
| 650 | 650 | 'show_icon' => false, |
| 651 | 651 | 'entry_id' => self::$entry->id, |
| 652 | 652 | 'sep' => self::$separator, |
| 653 | - '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, |
|
| 653 | + '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, |
|
| 654 | 654 | ) |
| 655 | 655 | ); |
| 656 | 656 | } |
@@ -665,8 +665,8 @@ discard block |
||
| 665 | 665 | // This is combo field inside repeater. The heading key has this format: [86_first[0]]. |
| 666 | 666 | foreach ( $sub_value as $sub_key => $sub_sub_value ) { |
| 667 | 667 | $column_key = $atts['col']->id . '_' . $sub_key . '[' . $key . ']'; |
| 668 | - if ( ! is_numeric( $sub_key ) && isset( self::$headings[ $column_key ] ) ) { |
|
| 669 | - $row[ $column_key ] = $sub_sub_value; |
|
| 668 | + if ( ! is_numeric( $sub_key ) && isset( self::$headings[$column_key] ) ) { |
|
| 669 | + $row[$column_key] = $sub_sub_value; |
|
| 670 | 670 | } |
| 671 | 671 | } |
| 672 | 672 | |
@@ -674,8 +674,8 @@ discard block |
||
| 674 | 674 | } |
| 675 | 675 | |
| 676 | 676 | $column_key = $atts['col']->id . '_' . $key; |
| 677 | - if ( ! is_numeric( $key ) && isset( self::$headings[ $column_key ] ) ) { |
|
| 678 | - $row[ $column_key ] = $sub_value; |
|
| 677 | + if ( ! is_numeric( $key ) && isset( self::$headings[$column_key] ) ) { |
|
| 678 | + $row[$column_key] = $sub_value; |
|
| 679 | 679 | } |
| 680 | 680 | } |
| 681 | 681 | } |
@@ -700,18 +700,18 @@ discard block |
||
| 700 | 700 | $echo = 'echo' === self::$mode; |
| 701 | 701 | |
| 702 | 702 | foreach ( self::$headings as $k => $heading ) { |
| 703 | - if ( isset( $rows[ $k ] ) ) { |
|
| 704 | - $row = $rows[ $k ]; |
|
| 703 | + if ( isset( $rows[$k] ) ) { |
|
| 704 | + $row = $rows[$k]; |
|
| 705 | 705 | } else { |
| 706 | 706 | $row = ''; |
| 707 | 707 | // array indexed data is not at $rows[ $k ] |
| 708 | - if ( $k[ strlen( $k ) - 1 ] === ']' ) { |
|
| 708 | + if ( $k[strlen( $k ) - 1] === ']' ) { |
|
| 709 | 709 | $start = strrpos( $k, '[' ); |
| 710 | - $key = substr( $k, 0, $start++ ); |
|
| 710 | + $key = substr( $k, 0, $start ++ ); |
|
| 711 | 711 | $index = substr( $k, $start, strlen( $k ) - 1 - $start ); |
| 712 | 712 | |
| 713 | - if ( isset( $rows[ $key ] ) && isset( $rows[ $key ][ $index ] ) ) { |
|
| 714 | - $row = $rows[ $key ][ $index ]; |
|
| 713 | + if ( isset( $rows[$key] ) && isset( $rows[$key][$index] ) ) { |
|
| 714 | + $row = $rows[$key][$index]; |
|
| 715 | 715 | } |
| 716 | 716 | |
| 717 | 717 | unset( $start, $key, $index ); |