]>
Commit | Line | Data |
---|---|---|
16fd5964 ER |
1 | --- php-4.3.0/ext/standard/mail.c Thu Jan 2 12:37:54 2003 |
2 | +++ php-5.1.4-mail/ext/standard/mail.c 2006-06-07 17:48:45.197705968 +0300 | |
5316c927 AF |
3 | @@ -21,6 +21,8 @@ |
4 | #include <stdlib.h> | |
5 | #include <ctype.h> | |
6 | #include <stdio.h> | |
7 | +#include <syslog.h> | |
8 | +#include <string.h> | |
9 | #include "php.h" | |
804cfcec | 10 | #include "ext/standard/info.h" |
8135bbee JB |
11 | |
12 | @@ -36,6 +38,9 @@ | |
804cfcec AM |
13 | #include "safe_mode.h" |
14 | #include "exec.h" | |
15 | ||
16 | +#include "zend_operators.h" | |
804cfcec AM |
17 | +#include "zend_globals.h" |
18 | + | |
19 | #if HAVE_SENDMAIL | |
20 | #ifdef PHP_WIN32 | |
21 | #include "win32/sendmail.h" | |
71de1d89 | 22 | @@ -104,6 +109,25 @@ |
16fd5964 ER |
23 | return; |
24 | } | |
25 | ||
26 | + /* check for spam attempts with buggy webforms */ | |
27 | + if (strchr(to, '\n') != NULL || strchr(to, '\r') != NULL) { | |
af917294 | 28 | + zend_error(E_WARNING, "Newlines aren't allowed in the To header. Mail not sent."); |
16fd5964 ER |
29 | + RETURN_FALSE; |
30 | + } | |
31 | + | |
32 | + if (strchr(subject, '\n') != NULL || strchr(subject, '\r') != NULL) { | |
af917294 | 33 | + zend_error(E_WARNING, "Newlines aren't allowed in the Subject header. Mail not sent."); |
16fd5964 ER |
34 | + RETURN_FALSE; |
35 | + } | |
36 | + | |
37 | + /* search for to, cc or bcc headers */ | |
38 | + if (headers != NULL) { | |
39 | + if (strncasecmp(headers, "to:", sizeof("to:") - 1) == 0 || strcasestr(headers, "\nto:")) { | |
9be9df81 | 40 | + zend_error(E_WARNING, "To: headers aren't allowed in the additional_headers parameter. Use $to parameter for that. Mail not sent."); |
16fd5964 ER |
41 | + RETURN_FALSE; |
42 | + } | |
16fd5964 ER |
43 | + } |
44 | + | |
45 | if (to_len > 0) { | |
46 | to_r = estrndup(to, to_len); | |
47 | for (; to_len; to_len--) { | |
71de1d89 | 48 | @@ -196,8 +220,42 @@ |
8135bbee JB |
49 | return 0; |
50 | } | |
51 | #endif | |
5316c927 AF |
52 | - fprintf(sendmail, "To: %s\n", to); |
53 | - fprintf(sendmail, "Subject: %s\n", subject); | |
edf77de8 | 54 | + TSRMLS_FETCH(); |
55 | + | |
5316c927 AF |
56 | + if ((to != NULL) && (strlen(to)!=0)) { |
57 | + fprintf(sendmail, "To: %s\n", to); | |
58 | + } | |
59 | + if ((subject != NULL) && (strlen(subject)!=0)) { | |
60 | + fprintf(sendmail, "Subject: %s\n", subject); | |
61 | + } | |
804cfcec | 62 | + |
804cfcec AM |
63 | + if (PG(http_globals)[TRACK_VARS_SERVER]) { |
64 | + zval **remote_addr, **server_name, **server_port, | |
bfb8a2ed | 65 | + **script_name, **http_user_agent; |
804cfcec AM |
66 | + |
67 | + if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "REMOTE_ADDR", sizeof("REMOTE_ADDR"), (void **) &remote_addr)==SUCCESS) { | |
68 | + convert_to_string_ex(remote_addr); | |
69 | + fprintf(sendmail, "HTTP-Posting-Client: %s\n", Z_STRVAL_PP(remote_addr)); | |
70 | + } | |
71 | + if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SERVER_NAME", sizeof("SERVER_NAME"), (void **) &server_name)==SUCCESS) { | |
72 | + convert_to_string_ex(server_name); | |
b4e19d31 | 73 | + fprintf(sendmail, "HTTP-Posting-URI: %s", Z_STRVAL_PP(server_name)); |
804cfcec AM |
74 | + if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SERVER_PORT", sizeof("SERVER_PORT"), (void **) &server_port)==SUCCESS) { |
75 | + convert_to_string_ex(server_port); | |
76 | + fprintf(sendmail, ":%s", Z_STRVAL_PP(server_port)); | |
77 | + } | |
18e705dd | 78 | + if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SCRIPT_NAME", sizeof("SCRIPT_NAME"), (void **) &script_name)==SUCCESS) { |
bfb8a2ed AM |
79 | + convert_to_string_ex(script_name); |
80 | + fprintf(sendmail, "%s", Z_STRVAL_PP(script_name)); | |
804cfcec AM |
81 | + } |
82 | + fprintf(sendmail, "\n"); | |
83 | + } | |
84 | + if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "HTTP_USER_AGENT", sizeof("HTTP_USER_AGENT"), (void **) &http_user_agent)==SUCCESS) { | |
85 | + convert_to_string_ex(http_user_agent); | |
86 | + fprintf(sendmail, "HTTP-Posting-User-Agent: %s\n", Z_STRVAL_PP(http_user_agent)); | |
87 | + } | |
88 | + } | |
89 | + | |
5316c927 AF |
90 | if (headers != NULL) { |
91 | fprintf(sendmail, "%s\n", headers); | |
92 | } |