--- parser3/src/classes/mail.C	2001/04/07 11:55:30	1.2
+++ parser3/src/classes/mail.C	2001/04/07 13:48:35	1.4
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: mail.C,v 1.2 2001/04/07 11:55:30 paf Exp $
+	$Id: mail.C,v 1.4 2001/04/07 13:48:35 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -14,6 +14,10 @@
 #include "pa_common.h"
 #include "pa_request.h"
 
+#ifdef WIN32
+#	include "smtp/smtp.h"
+#endif
+
 // global var
 
 VStateless_class *mail_class;
@@ -93,24 +97,25 @@ static const String& letter_hash_to_stri
 	if(Value *body_element=static_cast<Value *>(letter_hash.get(*body_name))) {
 		if(Hash *body_hash=body_element->get_hash()) {
 			char *boundary=(char *)pool.malloc(MAX_NUMBER);
-			snprintf(boundary, MAX_NUMBER, "B%d", level);
+			snprintf(boundary, MAX_NUMBER-6/*level_*/, "level_%d", level);
 			// multi-part
-			result+="content-type: multipart/mixed;\n"
-				"    boundary=\"----="; result+=boundary; result+="\"\n"
+			((result+=
+				"content-type: multipart/mixed;\n"
+				"    boundary=\"----=")+=boundary)+="\"\n"
 				"\n"
 				"This is a multi-part message in MIME format.";
 
-			// body parts
-			// collect
+			// body parts..
+			// ..collect
 			Seq_item *seq=(Seq_item *)malloc(sizeof(Seq_item)*body_hash->size());
 			Seq_item *seq_ref=seq;  body_hash->for_each(add_part, &seq_ref);
-			// sort
+			// ..sort
 			_qsort(seq, body_hash->size(), sizeof(Seq_item), 
 				sort_cmp_string_double_value);
-			// insert parts in 'seq' order
+			// ..insert in 'seq' order
 			for(int i=0; i<body_hash->size(); i++) {
 				// intermediate boundary
-				result+="\n------="; result+=boundary; result+="\n";
+				((result+="\n------=")+=boundary)+="\n";
 
 				if(Hash *part_hash=seq[i].part_value->get_hash())
 					result+=letter_hash_to_string(r, method_name, *part_hash, 
@@ -122,10 +127,10 @@ static const String& letter_hash_to_stri
 			}
 
 			// finish boundary
-			result+="\n------="; result+=boundary; result+="--\n";
+			((result+="\n------=")+=boundary)+="--\n";
 		} else {
 			result+="\n"; // header|body separator
-			result+=body_element->as_string(); 
+			result+=body_element->as_string();  // body
 		}
 	} else 
 		PTHROW(0, 0,
@@ -135,6 +140,45 @@ static const String& letter_hash_to_stri
 	return result;
 }
 
+
+/// @test unix ver
+static void sendmail(Request& r, const String& method_name, 
+					 const String& letter, 
+					 const String *from, const String *to) {
+	Pool& pool=r.pool();
+
+#ifdef WIN32
+	if(!from)
+		PTHROW(0, 0,
+			&method_name,
+			"not specified 'from'");
+	if(!to)
+		PTHROW(0, 0,
+			&method_name,
+			"not specified 'to'");
+
+	char *letter_cstr=letter.cstr();
+	SMTP& smtp=*new(pool) SMTP(pool, method_name);
+	const String *server_port;
+	// $MAIN:MAIL.SMTP[mail.design.ru]
+	if(r.mail && (server_port=r.mail->get_string(*new(pool) String(pool, "SMTP")))) {
+		char *server=server_port->cstr();
+		char *port=rsplit(server, ':');
+		if(!port)
+			port="25";
+
+		smtp.Send(server, port, letter_cstr, from->cstr(), to->cstr());
+	} else
+		PTHROW(0, 0,
+			&method_name,
+			"$MAIN:MAIL.SMTP not defined");
+#else
+	PTHROW(0, 0,
+		&method_name,
+		"todo");
+#endif
+}
+
 static void _send(Request& r, const String& method_name, Array *params) {
 	Pool& pool=r.pool();
 
@@ -149,9 +193,9 @@ static void _send(Request& r, const Stri
 			"message must be hash");
 
 	const String *from, *to;
-	const String& string=letter_hash_to_string(r, method_name, *hash, 0, &from, &to);
+	const String& letter=letter_hash_to_string(r, method_name, *hash, 0, &from, &to);
 
-	r.write_assign_lang(*new(pool) VString(string));
+	sendmail(r, method_name, letter, from, to);
 }
 
 // initialize