cvs: php4 /win32 sendmail.c

hholzgra Tue Jun 27 09:15:16 2000 EDT Modified files: /php4/win32 sendmail.c Log: should now get multiple To: and Cc: recievers right (code taken from php3 version) Index: php4/win32/sendmail.c diff -u php4/win32/sendmail.c:1.8 php4/win32/sendmail.c:1.9 --- php4/win32/sendmail.c:1.8 Sat Jun 17 07:48:03 2000 +++ php4/win32/sendmail.c Tue Jun 27 09:15:16 2000 @@ -214,7 +214,7 @@ if (strchr(mailTo, '@') == NULL) return (BAD_MSG_DESTINATION); - sprintf(Buffer, "HELO %s\n", LocalHost); + sprintf(Buffer, "HELO %s\r\n", LocalHost); /* in the beggining of the dialog */ /* attempt reconnect if the first Post fail */ @@ -226,20 +226,38 @@ if ((res = Ack()) != SUCCESS) return (res); - sprintf(Buffer, "MAIL FROM:<%s>\n", RPath); - if ((res = Post(Buffer)) != SUCCESS) - return (res); - if ((res = Ack()) != SUCCESS) - return (res); + // Send mail to all rcpt's + token = strtok(tempMailTo, ","); + while(token != NULL) + { + sprintf(Buffer, "RCPT TO:<%s>\r\n", token); + if ((res = Post(Buffer)) != SUCCESS) + return (res); + if ((res = Ack()) != SUCCESS) + return (res); + token = strtok(NULL, ","); + } + // Send mail to all Cc rcpt's + efree(tempMailTo); + if (headers && pos1 = strstr(headers, "Cc:")) { + pos2 = strstr(pos1, "\r\n"); + tempMailTo = estrndup(pos1, pos2-pos1); - sprintf(Buffer, "RCPT TO:<%s>\n", mailTo); - if ((res = Post(Buffer)) != SUCCESS) - return (res); - if ((res = Ack()) != SUCCESS) - return (res); + token = strtok(tempMailTo, ","); + while(token != NULL) + { + sprintf(Buffer, "RCPT TO:<%s>\r\n", token); + if ((res = Post(Buffer)) != SUCCESS) + return (res); + if ((res = Ack()) != SUCCESS) + return (res); + token = strtok(NULL, ","); + } + efree(tempMailTo); + } - if ((res = Post("DATA\n")) != SUCCESS) + if ((res = Post("DATA\r\n")) != SUCCESS) return (res); if ((res = Ack()) != SUCCESS) return (res);