--- parser3/src/classes/mail.C	2003/07/24 11:31:20	1.89
+++ parser3/src/classes/mail.C	2004/02/24 11:25:38	1.102
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b mail parser class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_MAIL_C="$Date: 2003/07/24 11:31:20 $";
+static const char * const IDENT_MAIL_C="$Date: 2004/02/24 11:25:38 $";
 
 #include "pa_config_includes.h"
 #include "pa_vmethod_frame.h"
@@ -20,13 +20,13 @@ static const char* IDENT_MAIL_C="$Date:
 #include "pa_vmail.h"
 
 #ifdef _MSC_VER
-#	include "smtp/smtp.h"
+#	include "smtp.h"
 #endif
 
 // defines
 
 #define MAIL_CLASS_NAME "mail"
-#define MAIL_SENDMAIL_NAME "sendmail"
+#define SENDMAIL_NAME "sendmail"
 
 // consts
 
@@ -54,13 +54,18 @@ DECLARE_CLASS_VAR(mail, 0/*fictive*/, ne
 // statics
 	
 static const String mail_name(MAIL_NAME);
-static const String mail_sendmail_name(MAIL_SENDMAIL_NAME);
+static const String mail_sendmail_name(SENDMAIL_NAME);
 
 // helpers
 
 static void sendmail(Request& r, 
 		     const String& message, 
-		     const String* from, const String* to) {
+		     const String* from, const String* to,
+			 const String* 
+#ifndef _MSC_VER
+			 options
+#endif
+			 ) {
 	const char* message_cstr=message.cstr(String::L_UNSPECIFIED);
 	Value* vmail_conf=static_cast<Value*>(r.classes_conf.get(mail_base_class->name()));
 
@@ -69,34 +74,38 @@ static void sendmail(Request& r,
 		throw Exception(exception_type,
 			0,
 			"parameter does not specify 'from' header field");
-
-#ifdef _MSC_VER
 	if(!to) // we use only in SMTP RCPT to: {to}
 		throw Exception(exception_type,
 			0,
 			"parameter does not specify 'to' header field");
 
-	SMTP smtp;
-	Value* server_port;
-	// $MAIN:MAIL.SMTP[mail.yourdomain.ru[:port]]
-	if(vmail_conf && 
-		(server_port=vmail_conf->get_hash()->get(StringBody("SMTP")))) {
-		char* server=server_port->as_string().cstrm();
+	Value* smtp_server_port=0;
+	if(vmail_conf) {
+		// $MAIN:MAIL.SMTP[mail.yourdomain.ru[:port]]
+		smtp_server_port=vmail_conf->get_hash()->get(String::Body("SMTP"));
+	}
+	if(smtp_server_port) {
+		SMTP smtp;
+		char* server=smtp_server_port->as_string().cstrm();
 		const char* port=rsplit(server, ':');
 		if(!port)
 			port="25";
 
 		smtp.Send(server, port, message_cstr, from->cstrm(), to->cstrm());
-	} else
-		throw Exception("parser.runtime",
-			0,
-			"$"MAIN_CLASS_NAME":"MAIL_NAME".SMTP not defined");
+		return;
+	}
+
+#if WIN32
+	// win32 without SMTP server configured
+	throw Exception("parser.runtime",
+		0,
+		"$"MAIN_CLASS_NAME":"MAIL_NAME".SMTP not defined");
 #else
 	// unix
 	// $MAIN:MAIL.sendmail["/usr/sbin/sendmail -t -i -f postmaster"] default
 	// $MAIN:MAIL.sendmail["/usr/lib/sendmail -t -i  -f postmaster"] default
 
-	const String* sendmail_command;
+	String* sendmail_command=new String;
 	if(vmail_conf) {
 #ifdef PA_FORCED_SENDMAIL
 		throw Exception("parser.runtime",
@@ -105,23 +114,25 @@ static void sendmail(Request& r,
 			" key, to change sendmail you should reconfigure and recompie it");
 #else
 		if(Value* sendmail_value=vmail_conf->get_hash()->get(mail_sendmail_name))
-			sendmail_command=&sendmail_value->as_string();
+			*sendmail_command<<sendmail_value->as_string();
 		else
 			throw Exception("parser.runtime",
 				0,
-				"$"MAIN_CLASS_NAME":"MAIL_NAME"."MAIL_SENDMAIL_NAME" not defined");
+				"$"MAIN_CLASS_NAME":"MAIL_NAME"."SENDMAIL_NAME" not defined");
 #endif
 	} else {
 #ifdef PA_FORCED_SENDMAIL
-		sendmail_command=new String(PA_FORCED_SENDMAIL);
+		*sendmail_command<<PA_FORCED_SENDMAIL;
 #else
 		String* test=new String("/usr/sbin/sendmail");
 		if(!file_executable(*test))
 			test=new String("/usr/lib/sendmail");
-		*test<<" -t -i -f postmaster";
-		sendmail_command=test;
+		*sendmail_command<<*test;
+		*sendmail_command<<" -t -i -f postmaster";
 #endif
 	}
+	if(options)
+		*sendmail_command<<" "<<*options;
 
 	// we know sendmail_command here, should replace "postmaster" with "$from" from message
 	size_t at_postmaster=sendmail_command->pos("postmaster");
@@ -151,12 +162,12 @@ static void sendmail(Request& r,
 #ifdef PA_FORCED_SENDMAIL
 			" Use configure key \"--with-sendmail=appropriate sendmail command\""
 #else
-			" Set $"MAIN_CLASS_NAME":"MAIL_NAME"."MAIL_SENDMAIL_NAME" to appropriate sendmail command"
+			" Set $"MAIN_CLASS_NAME":"MAIL_NAME"."SENDMAIL_NAME" to appropriate sendmail command"
 #endif
 		);
 
 
-	String in(message_cstr); String out; String err;
+	String in(message_cstr);
 	PA_exec_result exec=pa_exec(
 		// forced_allow
 #ifdef PA_FORCED_SENDMAIL
@@ -188,19 +199,17 @@ static void _send(Request& r, MethodPara
 			0,
 			"message must be hash");
 
+	const String* soptions=0;
+	if(Value* voptions=hash->get(MAIL_OPTIONS_NAME))
+		soptions=&voptions->as_string();
+
 	const String* from=0;
 	String* to=0;
 	const String& message=
-		GET_SELF(r, VMail).message_hash_to_string(r, hash, 0, from, 
-#ifdef WIN32
-			true
-#else
-			false
-#endif
-			, to);
+		GET_SELF(r, VMail).message_hash_to_string(r, hash, 0, from, to);
 
 	//r.write_pass_lang(message);
-	sendmail(r, message, from, to);
+	sendmail(r, message, from, to, soptions);
 }
 
 // constructor & configurator