--- parser3/src/classes/mail.C	2003/11/21 12:44:41	1.97
+++ parser3/src/classes/mail.C	2009/07/06 12:13:30	1.112
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b mail parser class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_MAIL_C="$Date: 2003/11/21 12:44:41 $";
+static const char * const IDENT_MAIL_C="$Date: 2009/07/06 12:13:30 $";
 
 #include "pa_config_includes.h"
 #include "pa_vmethod_frame.h"
@@ -19,9 +19,11 @@ static const char * const IDENT_MAIL_C="
 #include "pa_uue.h"
 #include "pa_vmail.h"
 
-#ifdef _MSC_VER
-#	include "smtp.h"
-#endif
+#include "smtp.h"
+
+// debug switches
+
+//#define DEBUG_JUST_SEE_MESSAGE
 
 // defines
 
@@ -58,48 +60,47 @@ static const String mail_sendmail_name(S
 
 // helpers
 
-static void sendmail(Request& r, 
-		     const String& message, 
-		     const String* from, const String* 
-#ifdef _MSC_VER
-			 to
+static void sendmail(
+			Value* 
+#ifndef WIN32
+			vmail_conf
 #endif
-			 ,
+			, Value* smtp_server_port,
+		     const String& message, 
+		     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()));
+	const char* message_cstr=message.untaint_cstr(String::L_AS_IS);
 
 	const char* exception_type="email.format";
 	if(!from) // we use in sendmail -f {from} && SMTP MAIL from: {from}
 		throw Exception(exception_type,
 			0,
 			"parameter does not specify 'from' header field");
+	if(smtp_server_port) {
+		if(!to) // we use only in SMTP RCPT to: {to}
+			throw Exception(exception_type,
+				0,
+				"parameter does not specify 'to' 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(String::Body("SMTP")))) {
-		char* server=server_port->as_string().cstrm();
+		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
@@ -108,7 +109,7 @@ static void sendmail(Request& r,
 	String* sendmail_command=new String;
 	if(vmail_conf) {
 #ifdef PA_FORCED_SENDMAIL
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			0,
 			"Parser was configured with --with-sendmail="PA_FORCED_SENDMAIL
 			" key, to change sendmail you should reconfigure and recompie it");
@@ -116,7 +117,7 @@ static void sendmail(Request& r,
 		if(Value* sendmail_value=vmail_conf->get_hash()->get(mail_sendmail_name))
 			*sendmail_command<<sendmail_value->as_string();
 		else
-			throw Exception("parser.runtime",
+			throw Exception(PARSER_RUNTIME,
 				0,
 				"$"MAIN_CLASS_NAME":"MAIL_NAME"."SENDMAIL_NAME" not defined");
 #endif
@@ -195,7 +196,7 @@ static void _send(Request& r, MethodPara
 	Value& vhash=params.as_no_junction(0, "message must not be code");
 	HashStringValue* hash=vhash.get_hash();
 	if(!hash)
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			0,
 			"message must be hash");
 
@@ -203,19 +204,26 @@ static void _send(Request& r, MethodPara
 	if(Value* voptions=hash->get(MAIL_OPTIONS_NAME))
 		soptions=&voptions->as_string();
 
+	Value* vmail_conf=static_cast<Value*>(r.classes_conf.get(mail_base_class->name()));
+	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"));
+	}
+
+
 	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
+			smtp_server_port?true:false /*send by SMTP=strip to?*/, to);
+
+#ifdef DEBUG_JUST_SEE_MESSAGE
+	r.write_pass_lang(message);
 #else
-			false
+	sendmail(vmail_conf, smtp_server_port, 
+		message, from, to, soptions);
 #endif
-			, to);
-
-	//r.write_pass_lang(message);
-	sendmail(r, message, from, to, soptions);
 }
 
 // constructor & configurator
@@ -233,7 +241,7 @@ void MMail::configure_user(Request& r) {
 			r.classes_conf.put(name(), mail_element);
 		else
 			if( !mail_element->is_string() )
-				throw Exception("parser.runtime",
+				throw Exception(PARSER_RUNTIME,
 					0,
 					"$" MAIL_CLASS_NAME ":" MAIL_NAME " is not hash");
 }