| @@ -462,34 +462,53 @@ | ||
| 462 | 462 | } |
| 463 | 463 | } |
| 464 | 464 | |
| 465 | 465 | /** |
| 466 | - * Parse out the custom fields with entry meta values | |
| 466 | + * Parse out the custom fields with options or values. Since the options are what is stored, options may need to be | |
| 467 | + * used to find the value from the field settings. | |
| 467 | 468 | * |
| 468 | - * @param string $text | |
| 469 | + * For example, let's say we have the following options: | |
| 470 | + * DEPARTMENT / EMAIL | |
| 471 | + * Support / support@example.com | |
| 472 | + * Sales / sales@example.com | |
| 469 | 473 | * |
| 470 | - * @return string | |
| 474 | + * Users need the ability to pass {field:department} and get "Support", | |
| 475 | + * and {value:department} to get support@email.com | |
| 476 | + * | |
| 477 | + * @param string $text The text to parse. | |
| 478 | + * @param int $entry_id The entry ID. | |
| 479 | + * | |
| 480 | + * @return string $text The parsed text. | |
| 471 | 481 | */ |
| 472 | 482 | public static function replace_field_tags( $text, $entry_id ) { |
| 473 | - $pattern = '/{field:(\w*)}/'; | |
| 483 | + // Validate data. | |
| 484 | + if ( empty( $text ) || empty( $entry_id ) ) { | |
| 485 | + return; | |
| 486 | + } | |
| 474 | 487 | |
| 475 | - preg_match_all( $pattern, $text, $matches ); | |
| 488 | + // Users looking for {field:something} or {value:something}, determine which one. | |
| 489 | + $is_field = preg_match( '/{field:(\w*)}/', $text, $matches_field ); | |
| 490 | + $is_value = preg_match( '/{value:(\w*)}/', $text, $matches_value ); | |
| 476 | 491 | |
| 477 | - // bail out if nothing found to be replaced | |
| 478 | - if ( !$matches ) { | |
| 479 | - return $text; | |
| 480 | - } | |
| 481 | - | |
| 482 | - foreach ( $matches[1] as $index => $meta_key ) { | |
| 492 | + if ( $is_field ) { | |
| 493 | + $meta_key = $matches_field[1]; | |
| 483 | 494 | $meta_value = weforms_get_entry_meta( $entry_id, $meta_key, true ); |
| 484 | - | |
| 485 | 495 | if ( is_array( $meta_value ) ) { |
| 486 | 496 | $meta_value = implode( WeForms::$field_separator, $meta_value ); |
| 487 | 497 | } |
| 488 | - | |
| 489 | - $text = str_replace( $matches[0][$index], $meta_value, $text ); | |
| 498 | + // $text may include HTML tags, only replace tag that was matched. | |
| 499 | + $text = str_replace( $matches_field[0], $meta_value, $text ); | |
| 500 | + } elseif ( $is_value ) { | |
| 501 | + $meta_key = $matches_value[1]; | |
| 502 | + $form_field_values = WeForms_Form_Entry::get_form( $entry_id )->get_field_values()[ $meta_key ]['options']; | |
| 503 | + $meta_value = weforms_get_entry_meta( $entry_id, $meta_key, true ); | |
| 504 | + $modified_value = array_search( $meta_value, $form_field_values ); | |
| 505 | + if ( is_array( $modified_value ) ) { | |
| 506 | + $modified_value = implode( WeForms::$field_separator, $modified_value ); | |
| 507 | + } | |
| 508 | + // $text may include HTML tags, only replace tag that was matched. | |
| 509 | + $text = str_replace( $matches_value[0], $modified_value, $text ); | |
| 490 | 510 | } |
| 491 | - | |
| 492 | 511 | return $text; |
| 493 | 512 | } |
| 494 | 513 | |
| 495 | 514 | /** |
| @@ -647,9 +666,9 @@ | ||
| 647 | 666 | $table .= '</tr>'; |
| 648 | 667 | $table .= '<tr class="field-value">'; |
| 649 | 668 | $table .= '<td>'; |
| 650 | 669 | |
| 651 | - if ( in_array( $value['type'], [ 'multiple_select', 'checkbox_field' ] ) ) { | |
| 670 | + if ( in_array( $value['type'], array( 'multiple_select', 'checkbox_field' ) ) ) { | |
| 652 | 671 | $field_value = is_array( $field_value ) ? $field_value : []; |
| 653 | 672 | |
| 654 | 673 | if ( $field_value ) { |
| 655 | 674 | $table .= '<ul>'; |
| @@ -660,8 +679,10 @@ | ||
| 660 | 679 | $table .= '</ul>'; |
| 661 | 680 | } else { |
| 662 | 681 | $table .= '—'; |
| 663 | 682 | } |
| 683 | + } elseif ( in_array( $value['type'], array( 'google_map' ) ) ) { | |
| 684 | + $table .= $field_value['address']; | |
| 664 | 685 | } else { |
| 665 | 686 | $table .= $field_value; |
| 666 | 687 | } |
| 667 | 688 | |
