| @@ -462,66 +462,34 @@ | ||
| 462 | 462 | } |
| 463 | 463 | } |
| 464 | 464 | |
| 465 | 465 | /** |
| 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. | |
| 466 | + * Parse out the custom fields with entry meta values | |
| 468 | 467 | * |
| 469 | - * For example, let's say we have the following options: | |
| 470 | - * DEPARTMENT / EMAIL | |
| 471 | - * Support / support@example.com | |
| 472 | - * Sales / sales@example.com | |
| 468 | + * @param string $text | |
| 473 | 469 | * |
| 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. Optional. Default null if tags to be replaced are on the frontend. | |
| 479 | - * | |
| 480 | - * @return string $text The parsed text. | |
| 470 | + * @return string | |
| 481 | 471 | */ |
| 482 | - public static function replace_field_tags( $text, $entry_id = null ) { | |
| 483 | - // Validate data. | |
| 484 | - if ( empty( $text ) || !isset( $entry_id ) ) { | |
| 485 | - return; | |
| 472 | + public static function replace_field_tags( $text, $entry_id ) { | |
| 473 | + $pattern = '/{field:(\w*)}/'; | |
| 474 | + | |
| 475 | + preg_match_all( $pattern, $text, $matches ); | |
| 476 | + | |
| 477 | + // bail out if nothing found to be replaced | |
| 478 | + if ( !$matches ) { | |
| 479 | + return $text; | |
| 486 | 480 | } |
| 487 | 481 | |
| 488 | - // Users looking for {field:something} or {value:something}, determine which one. | |
| 489 | - $is_field = preg_match_all( '/{field:(\w*)}/', $text, $matches_field ); | |
| 490 | - $is_value = preg_match_all( '/{value:(\w*)}/', $text, $matches_value ); | |
| 482 | + foreach ( $matches[1] as $index => $meta_key ) { | |
| 483 | + $meta_value = weforms_get_entry_meta( $entry_id, $meta_key, true ); | |
| 491 | 484 | |
| 492 | - if ( $is_field ) { | |
| 493 | - $meta_keys = $matches_field[1]; | |
| 494 | - // Create an array of meta values to replace. | |
| 495 | - $meta_values = array(); | |
| 496 | - foreach ( $meta_keys as $meta_key ) { | |
| 497 | - $meta_value = weforms_get_entry_meta( $entry_id, $meta_key, true ); | |
| 498 | - // Add values to the array. | |
| 499 | - array_push( $meta_values, $meta_value ); | |
| 500 | - if ( is_array( $meta_value ) ) { | |
| 501 | - $meta_value = implode( WeForms::$field_separator, $meta_value ); | |
| 502 | - } | |
| 485 | + if ( is_array( $meta_value ) ) { | |
| 486 | + $meta_value = implode( WeForms::$field_separator, $meta_value ); | |
| 503 | 487 | } |
| 504 | - // $text may include HTML tags, only replace tag that was matched. Replace all matches. | |
| 505 | - $text = str_replace( $matches_field[0], $meta_values, $text ); | |
| 488 | + | |
| 489 | + $text = str_replace( $matches[0][$index], $meta_value, $text ); | |
| 506 | 490 | } |
| 507 | - if ( $is_value ) { | |
| 508 | - $meta_keys = $matches_value[1]; | |
| 509 | - // Create an array of modified values to replace. | |
| 510 | - $modified_values = array(); | |
| 511 | - foreach ( $meta_keys as $meta_key ) { | |
| 512 | - $form_field_values = WeForms_Form_Entry::get_form( $entry_id )->get_field_values()[ $meta_key ]['options']; | |
| 513 | - $meta_value = weforms_get_entry_meta( $entry_id, $meta_key, true ); | |
| 514 | - $modified_value = array_search( $meta_value, $form_field_values ); | |
| 515 | - // Add values to the array. | |
| 516 | - array_push( $modified_values, $modified_value ); | |
| 517 | - if ( is_array( $modified_value ) ) { | |
| 518 | - $modified_value = implode( WeForms::$field_separator, $modified_value ); | |
| 519 | - } | |
| 520 | - } | |
| 521 | - // $text may include HTML tags, only replace tag that was matched. | |
| 522 | - $text = str_replace( $matches_value[0], $modified_values, $text ); | |
| 523 | - } | |
| 491 | + | |
| 524 | 492 | return $text; |
| 525 | 493 | } |
| 526 | 494 | |
| 527 | 495 | /** |
| @@ -679,9 +647,9 @@ | ||
| 679 | 647 | $table .= '</tr>'; |
| 680 | 648 | $table .= '<tr class="field-value">'; |
| 681 | 649 | $table .= '<td>'; |
| 682 | 650 | |
| 683 | - if ( in_array( $value['type'], array( 'multiple_select', 'checkbox_field' ) ) ) { | |
| 651 | + if ( in_array( $value['type'], [ 'multiple_select', 'checkbox_field' ] ) ) { | |
| 684 | 652 | $field_value = is_array( $field_value ) ? $field_value : []; |
| 685 | 653 | |
| 686 | 654 | if ( $field_value ) { |
| 687 | 655 | $table .= '<ul>'; |
| @@ -692,10 +660,8 @@ | ||
| 692 | 660 | $table .= '</ul>'; |
| 693 | 661 | } else { |
| 694 | 662 | $table .= '—'; |
| 695 | 663 | } |
| 696 | - } elseif ( in_array( $value['type'], array( 'google_map' ) ) ) { | |
| 697 | - $table .= $field_value['address']; | |
| 698 | 664 | } else { |
| 699 | 665 | $table .= $field_value; |
| 700 | 666 | } |
| 701 | 667 | |
