--- parser3/src/classes/mail.C	2001/04/07 12:13:13	1.3
+++ parser3/src/classes/mail.C	2001/04/07 15:16:26	1.6
@@ -5,21 +5,24 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: mail.C,v 1.3 2001/04/07 12:13:13 paf Exp $
+	$Id: mail.C,v 1.6 2001/04/07 15:16:26 paf Exp $
 */
 
 #include "pa_config_includes.h"
 
+#ifdef WIN32
+#	include "smtp/smtp.h"
+#endif
+
 #include "_mail.h"
 #include "pa_common.h"
 #include "pa_request.h"
+#include "pa_vfile.h"
 
 // global var
 
 VStateless_class *mail_class;
 
-// consts
-
 // methods
 
 struct Mail_info {
@@ -126,7 +129,7 @@ static const String& letter_hash_to_stri
 			((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,
@@ -136,6 +139,47 @@ 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);
+	Value *server_port;
+	// $MAIN:MAIL.SMTP[mail.design.ru]
+	if(r.mail && 
+		(server_port=static_cast<Value *>(r.mail->get(
+			*new(pool) String(pool, "SMTP"))))) {
+		char *server=server_port->as_string().cstr();
+		char *port=rsplit(server, ':');
+		if(!port)
+			port=const_cast<char *>("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();
 
@@ -150,13 +194,75 @@ 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(letter));
+	//sendmail(r, method_name, letter, from, to);
+}
+
+/// ^mail:attach[uue|base64;DATA]
+/// ^mail:attach[uue|base64;DATA;user-file-name]
+static void _attach(Request& r, const String& method_name, Array *params) {
+	Pool& pool=r.pool();
 
-	r.write_assign_lang(*new(pool) VString(string));
+	Value& vtype=*static_cast<Value *>(params->get(0));
+	// forcing [this vtype]
+	r.fail_if_junction_(true, vtype, method_name, "type must not be code");
+
+	Value& vdata=*static_cast<Value *>(params->get(1));
+	// forcing [this vtype]
+	r.fail_if_junction_(true, vdata, method_name, "data must not be code");
+	const VFile& vfile=*vdata.as_vfile();
+
+	Value *user_file_name;
+	if(params->size()>2) {
+		user_file_name=static_cast<Value *>(params->get(0));
+		// forcing [this vtype]
+		r.fail_if_junction_(true, *user_file_name, method_name, 
+			"user file name must not be code");
+	} else {
+		user_file_name=static_cast<Value *>(vfile.fields().get(*name_name));
+	}
+
+	VHash& result=*new(pool) VHash(pool);
+
+	{ // content-disposition: attachment; filename='user_file_name'
+		VHash& content_disposition=*new(pool) VHash(pool);
+		content_disposition.hash().put(*value_name,
+			new(pool) VString(*new(pool) String(pool, "attachment")));
+		content_disposition.hash().put(
+			*new(pool) String(pool, "filename"),
+			user_file_name);
+		result.hash().put(*new(pool) String(pool, "content-disposition"),
+			&content_disposition);
+	}
+
+	const String& type=vtype.as_string();
+	if(type=="uue") {
+		{ // content-transfer-encoding: x-uuencode
+			VString& content_transfer_encoding=*new(pool) VString(
+				*new(pool) String(pool, "x-uuencode"));
+			result.hash().put(*new(pool) String(pool, "content-transfer-encoding"),
+				&content_transfer_encoding);
+		}
+
+		result.hash().put(*body_name, 
+			new(pool) String(pool, "todo"));
+	} else 
+		PTHROW(0, 0,
+			&type,
+			"unknown encode type");
+
+	result.set_name(*new(pool) String(pool, "100")); // so that would go last
+	r.write_no_lang(result);
 }
 
 // initialize
 void initialize_mail_class(Pool& pool, VStateless_class& vclass) {
 	// ^mail:send{hash}
 	vclass.add_native_method("send", Method::CT_STATIC, _send, 1, 1);
+
+	// ^mail:encode[uue|base64;DATA]
+	// ^mail:encode[uue|base64;DATA;user-file-name]
+	vclass.add_native_method("attach", Method::CT_ANY, _attach, 2, 3);
 }