| @@ -141,10 +141,8 @@ | ||
| 141 | 141 | * |
| 142 | 142 | * @since 2.03.04 |
| 143 | 143 | * |
| 144 | 144 | * @param object $action |
| 145 | - * | |
| 146 | - * @return void | |
| 147 | 145 | */ |
| 148 | 146 | private function set_email_key( $action ) { |
| 149 | 147 | $this->email_key = $action->ID; |
| 150 | 148 | } |
| @@ -154,10 +152,8 @@ | ||
| 154 | 152 | * |
| 155 | 153 | * @since 2.03.04 |
| 156 | 154 | * |
| 157 | 155 | * @param array $user_id_args |
| 158 | - * | |
| 159 | - * @return void | |
| 160 | 156 | */ |
| 161 | 157 | private function set_to( $user_id_args ) { |
| 162 | 158 | $to = $this->prepare_email_setting( $this->settings['email_to'], $user_id_args ); |
| 163 | 159 | $to = $this->explode_emails( $to ); |
| @@ -190,10 +186,8 @@ | ||
| 190 | 186 | * |
| 191 | 187 | * @since 2.03.04 |
| 192 | 188 | * |
| 193 | 189 | * @param array $user_id_args |
| 194 | - * | |
| 195 | - * @return void | |
| 196 | 190 | */ |
| 197 | 191 | private function set_cc( $user_id_args ) { |
| 198 | 192 | $this->cc = $this->prepare_additional_recipients( $this->settings['cc'], $user_id_args ); |
| 199 | 193 | } |
| @@ -203,10 +197,8 @@ | ||
| 203 | 197 | * |
| 204 | 198 | * @since 2.03.04 |
| 205 | 199 | * |
| 206 | 200 | * @param array $user_id_args |
| 207 | - * | |
| 208 | - * @return void | |
| 209 | 201 | */ |
| 210 | 202 | private function set_bcc( $user_id_args ) { |
| 211 | 203 | $this->bcc = $this->prepare_additional_recipients( $this->settings['bcc'], $user_id_args ); |
| 212 | 204 | } |
| @@ -254,10 +246,8 @@ | ||
| 254 | 246 | * |
| 255 | 247 | * @since 2.03.04 |
| 256 | 248 | * |
| 257 | 249 | * @param array $user_id_args |
| 258 | - * | |
| 259 | - * @return void | |
| 260 | 250 | */ |
| 261 | 251 | private function set_reply_to( $user_id_args ) { |
| 262 | 252 | $this->reply_to = trim( $this->settings['reply_to'] ); |
| 263 | 253 | |
| @@ -276,10 +266,8 @@ | ||
| 276 | 266 | * Set the is_plain_text property |
| 277 | 267 | * This should be set before the message |
| 278 | 268 | * |
| 279 | 269 | * @since 2.03.04 |
| 280 | - * | |
| 281 | - * @return void | |
| 282 | 270 | */ |
| 283 | 271 | private function set_is_plain_text() { |
| 284 | 272 | if ( $this->settings['plain_text'] ) { |
| 285 | 273 | $this->is_plain_text = true; |
| @@ -290,10 +278,8 @@ | ||
| 290 | 278 | * Set the include_user_info property |
| 291 | 279 | * This should be set before the message |
| 292 | 280 | * |
| 293 | 281 | * @since 2.03.04 |
| 294 | - * | |
| 295 | - * @return void | |
| 296 | 282 | */ |
| 297 | 283 | private function set_include_user_info() { |
| 298 | 284 | if ( isset( $this->settings['inc_user_info'] ) ) { |
| 299 | 285 | $this->include_user_info = $this->settings['inc_user_info']; |
| @@ -305,11 +291,8 @@ | ||
| 305 | 291 | * |
| 306 | 292 | * @since 2.03.04 |
| 307 | 293 | * |
| 308 | 294 | * @param $action |
| 309 | - * @param object $action | |
| 310 | - * | |
| 311 | - * @return void | |
| 312 | 295 | */ |
| 313 | 296 | private function set_is_single_recipient( $action ) { |
| 314 | 297 | $args = array( |
| 315 | 298 | 'form' => $this->form, |
| @@ -328,10 +311,8 @@ | ||
| 328 | 311 | /** |
| 329 | 312 | * Set the charset |
| 330 | 313 | * |
| 331 | 314 | * @since 2.03.04 |
| 332 | - * | |
| 333 | - * @return void | |
| 334 | 315 | */ |
| 335 | 316 | private function set_charset() { |
| 336 | 317 | $this->charset = get_option( 'blog_charset' ); |
| 337 | 318 | } |
| @@ -339,10 +320,8 @@ | ||
| 339 | 320 | /** |
| 340 | 321 | * Set the content type |
| 341 | 322 | * |
| 342 | 323 | * @since 2.03.04 |
| 343 | - * | |
| 344 | - * @return void | |
| 345 | 324 | */ |
| 346 | 325 | private function set_content_type() { |
| 347 | 326 | if ( $this->is_plain_text ) { |
| 348 | 327 | $this->content_type = 'text/plain'; |
| @@ -379,10 +358,8 @@ | ||
| 379 | 358 | /** |
| 380 | 359 | * Set the email message |
| 381 | 360 | * |
| 382 | 361 | * @since 2.03.04 |
| 383 | - * | |
| 384 | - * @return void | |
| 385 | 362 | */ |
| 386 | 363 | private function set_message() { |
| 387 | 364 | $this->message = $this->settings['email_message']; |
| 388 | 365 | |
| @@ -427,10 +404,8 @@ | ||
| 427 | 404 | } |
| 428 | 405 | |
| 429 | 406 | /** |
| 430 | 407 | * Runs message through autop, extracting the content inside body tag if it has <body>. |
| 431 | - * | |
| 432 | - * @return void | |
| 433 | 408 | */ |
| 434 | 409 | private function add_autop() { |
| 435 | 410 | $message = $this->message; |
| 436 | 411 | $result = preg_match( '/<body[^>]*>([\s\S]*?)<\/body>/', $message, $match ); |
| @@ -440,13 +415,8 @@ | ||
| 440 | 415 | $this->message = trim( wpautop( $message ) ); |
| 441 | 416 | } |
| 442 | 417 | } |
| 443 | 418 | |
| 444 | - /** | |
| 445 | - * @param string $mail_body | |
| 446 | - * | |
| 447 | - * @return void | |
| 448 | - */ | |
| 449 | 419 | private function maybe_add_ip( &$mail_body ) { |
| 450 | 420 | if ( ! empty( $this->entry->ip ) ) { |
| 451 | 421 | $mail_body .= __( 'IP Address', 'formidable' ) . ': ' . $this->entry->ip . "\r\n"; |
| 452 | 422 | } |
| @@ -767,12 +737,8 @@ | ||
| 767 | 737 | /** |
| 768 | 738 | * Get only the email if the name and email have been combined |
| 769 | 739 | * |
| 770 | 740 | * @since 3.0.06 |
| 771 | - * | |
| 772 | - * @param string $name | |
| 773 | - * | |
| 774 | - * @return string | |
| 775 | 741 | */ |
| 776 | 742 | private function get_email_from_name( $name ) { |
| 777 | 743 | $email = trim( trim( $name, '>' ), '<' ); |
| 778 | 744 | if ( strpos( $email, '<' ) !== false ) { |
| @@ -808,11 +774,8 @@ | ||
| 808 | 774 | } |
| 809 | 775 | |
| 810 | 776 | /** |
| 811 | 777 | * @since 3.0.06 |
| 812 | - * | |
| 813 | - * @param string $name | |
| 814 | - * @param string $email | |
| 815 | 778 | */ |
| 816 | 779 | private function format_from_email( $name, $email ) { |
| 817 | 780 | if ( '' !== $name ) { |
| 818 | 781 | $email = $name . ' <' . $email . '>'; |
| @@ -825,10 +788,8 @@ | ||
| 825 | 788 | * Remove phone numbers from To addresses |
| 826 | 789 | * Send the phone numbers to the frm_send_to_not_email hook |
| 827 | 790 | * |
| 828 | 791 | * @since 2.03.04 |
| 829 | - * | |
| 830 | - * @return void | |
| 831 | 792 | */ |
| 832 | 793 | private function handle_phone_numbers() { |
| 833 | 794 | |
| 834 | 795 | foreach ( $this->to as $key => $recipient ) { |
| @@ -886,10 +847,8 @@ | ||
| 886 | 847 | /** |
| 887 | 848 | * Remove the Buddypress email filters |
| 888 | 849 | * |
| 889 | 850 | * @since 2.03.04 |
| 890 | - * | |
| 891 | - * @return void | |
| 892 | 851 | */ |
| 893 | 852 | private function remove_buddypress_filters() { |
| 894 | 853 | remove_filter( 'wp_mail_from', 'bp_core_email_from_address_filter' ); |
| 895 | 854 | remove_filter( 'wp_mail_from_name', 'bp_core_email_from_name_filter' ); |
| @@ -899,10 +858,8 @@ | ||
| 899 | 858 | * Add Mandrill line break filter |
| 900 | 859 | * Remove line breaks in HTML emails to prevent conflicts with Mandrill |
| 901 | 860 | * |
| 902 | 861 | * @since 2.03.04 |
| 903 | - * | |
| 904 | - * @return void | |
| 905 | 862 | */ |
| 906 | 863 | private function add_mandrill_filter() { |
| 907 | 864 | if ( ! $this->is_plain_text ) { |
| 908 | 865 | add_filter( 'mandrill_nl2br', 'FrmEmailHelper::remove_mandrill_br' ); |
| @@ -912,10 +869,8 @@ | ||
| 912 | 869 | /** |
| 913 | 870 | * Remove Mandrill line break filter |
| 914 | 871 | * |
| 915 | 872 | * @since 2.03.04 |
| 916 | - * | |
| 917 | - * @return void | |
| 918 | 873 | */ |
| 919 | 874 | private function remove_mandrill_filter() { |
| 920 | 875 | remove_filter( 'mandrill_nl2br', 'FrmEmailHelper::remove_mandrill_br' ); |
| 921 | 876 | } |
