| @@ -216,9 +216,9 @@ | ||
| 216 | 216 | * |
| 217 | 217 | * @since 2.03.04 |
| 218 | 218 | * |
| 219 | 219 | * @param string $recipients |
| 220 | - * @param array $user_id_args | |
| 220 | + * @param array $user_id_args | |
| 221 | 221 | * |
| 222 | 222 | * @return array |
| 223 | 223 | */ |
| 224 | 224 | private function prepare_additional_recipients( $recipients, $user_id_args ) { |
| @@ -304,9 +304,8 @@ | ||
| 304 | 304 | * Set the is_single_recipient property |
| 305 | 305 | * |
| 306 | 306 | * @since 2.03.04 |
| 307 | 307 | * |
| 308 | - * @param $action | |
| 309 | 308 | * @param object $action |
| 310 | 309 | * |
| 311 | 310 | * @return void |
| 312 | 311 | */ |
| @@ -386,16 +385,19 @@ | ||
| 386 | 385 | private function set_message() { |
| 387 | 386 | $this->message = $this->settings['email_message']; |
| 388 | 387 | |
| 389 | 388 | if ( ! $this->is_plain_text ) { |
| 390 | - $this->message = html_entity_decode( $this->message ); // The decode is to support [default-html] shortcodes. | |
| 389 | + // The decode is to support [default-html] shortcodes. | |
| 390 | + $this->message = html_entity_decode( $this->message ); | |
| 391 | 391 | } |
| 392 | 392 | |
| 393 | 393 | $this->message = FrmFieldsHelper::basic_replace_shortcodes( $this->message, $this->form, $this->entry ); |
| 394 | 394 | |
| 395 | 395 | $prev_mail_body = $this->message; |
| 396 | - $pass_entry = clone $this->entry; // make a copy to prevent changes by reference | |
| 397 | - $mail_body = FrmEntriesHelper::replace_default_message( | |
| 396 | + | |
| 397 | + // Make a copy to prevent changes by reference. | |
| 398 | + $pass_entry = clone $this->entry; | |
| 399 | + $mail_body = FrmEntriesHelper::replace_default_message( | |
| 398 | 400 | $prev_mail_body, |
| 399 | 401 | array( |
| 400 | 402 | 'id' => $this->entry->id, |
| 401 | 403 | 'entry' => $pass_entry, |
| @@ -607,9 +609,9 @@ | ||
| 607 | 609 | * Get the userID field ID and key for email settings |
| 608 | 610 | * |
| 609 | 611 | * @since 2.03.04 |
| 610 | 612 | * |
| 611 | - * @param $form_id | |
| 613 | + * @param int $form_id | |
| 612 | 614 | * |
| 613 | 615 | * @return array |
| 614 | 616 | */ |
| 615 | 617 | private function get_user_id_args( $form_id ) { |
| @@ -631,9 +633,9 @@ | ||
| 631 | 633 | * |
| 632 | 634 | * @since 2.03.04 |
| 633 | 635 | * |
| 634 | 636 | * @param string $value |
| 635 | - * @param array $user_id_args | |
| 637 | + * @param array $user_id_args | |
| 636 | 638 | * |
| 637 | 639 | * @return string |
| 638 | 640 | */ |
| 639 | 641 | private function prepare_email_setting( $value, $user_id_args ) { |
| @@ -705,9 +707,9 @@ | ||
| 705 | 707 | } |
| 706 | 708 | } |
| 707 | 709 | |
| 708 | 710 | $recipients[ $key ] = $this->format_from_email( $name, $email ); |
| 709 | - } | |
| 711 | + }//end foreach | |
| 710 | 712 | |
| 711 | 713 | return $recipients; |
| 712 | 714 | } |
| 713 | 715 | |
| @@ -855,10 +857,10 @@ | ||
| 855 | 857 | ); |
| 856 | 858 | |
| 857 | 859 | // Remove phone number from to addresses |
| 858 | 860 | unset( $this->to[ $key ] ); |
| 859 | - } | |
| 860 | - } | |
| 861 | + }//end if | |
| 862 | + }//end foreach | |
| 861 | 863 | } |
| 862 | 864 | |
| 863 | 865 | /** |
| 864 | 866 | * Package an array of FrmEmail properties |
