--- parser3/src/classes/mail.C	2016/09/08 20:41:47	1.129
+++ parser3/src/classes/mail.C	2023/09/26 20:49:06	1.136
@@ -1,8 +1,8 @@
 /** @file
 	Parser: @b mail parser class.
 
-	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
 #include "pa_config_includes.h"
@@ -19,7 +19,7 @@
 
 #include "smtp.h"
 
-volatile const char * IDENT_MAIL_C="$Id: mail.C,v 1.129 2016/09/08 20:41:47 moko Exp $";
+volatile const char * IDENT_MAIL_C="$Id: mail.C,v 1.136 2023/09/26 20:49:06 moko Exp $";
 
 // defines
 
@@ -72,17 +72,13 @@ static void sendmail(
 			 ) {
 	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");
+		throw Exception(exception_type, 0, "parameter does not specify 'from' header field");
 
 	const char* message_cstr=message.untaint_cstr(String::L_AS_IS);
 
 	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");
+			throw Exception(exception_type, 0, "parameter does not specify 'to' header field");
 
 		SMTP smtp;
 		char* server=smtp_server_port->as_string().cstrm();
@@ -96,9 +92,7 @@ static void sendmail(
 
 #ifdef WIN32
 	// win32 without SMTP server configured
-	throw Exception(PARSER_RUNTIME,
-		0,
-		"$"MAIN_CLASS_NAME":"MAIL_NAME".SMTP not defined");
+	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
@@ -115,9 +109,7 @@ static void sendmail(
 		if(Value* sendmail_value=vmail_conf->get_hash()->get(mail_sendmail_name))
 			*sendmail_command<<sendmail_value->as_string();
 		else
-			throw Exception(PARSER_RUNTIME,
-				0,
-				"$" MAIN_CLASS_NAME ":" MAIL_NAME "." SENDMAIL_NAME " not defined");
+			throw Exception(PARSER_RUNTIME, 0, "$" MAIN_CLASS_NAME ":" MAIL_NAME "." SENDMAIL_NAME " not defined");
 #endif
 	} else {
 #ifdef PA_FORCED_SENDMAIL
@@ -164,8 +156,6 @@ static void sendmail(
 #endif
 		);
 
-
-	String in(message_cstr);
 	PA_exec_result exec=pa_exec(
 		// forced_allow
 #ifdef PA_FORCED_SENDMAIL
@@ -176,14 +166,10 @@ static void sendmail(
 		, *file_spec,
 		0 /* pass env */,
 		argv,
-		in);
+		String::C(message_cstr, strlen(message_cstr)));
+
 	if(exec.status || exec.err.length())
-		throw Exception("email.send",
-			0,
-			"'%s' reported problem: %s (%d)",
-				file_spec->cstr(),
-				exec.err.length()?exec.err.cstr():"UNKNOWN", 
-				exec.status);
+		throw Exception("email.send", 0, "'%s' reported problem: %s (%d)", file_spec->cstr(), exec.err.length() ? exec.err.cstr() : "UNKNOWN", exec.status);
 #endif //WIN32
 }
 
@@ -211,15 +197,12 @@ static void _send(Request& r, MethodPara
 		smtp_server_port=vmail_conf->get_hash()->get("SMTP");
 	}
 
-
 	const String* from=0;
 	String* to=0;
-	const String& message=
-		GET_SELF(r, VMail).message_hash_to_string(r, hash, 0, from, 
-			smtp_server_port?true:false /*send by SMTP=strip to?*/, to);
+	const String& message = GET_SELF(r, VMail).message_hash_to_string(r, hash, from, smtp_server_port ? true : false /*send by SMTP=strip to?*/, to);
 
 	if(print_debug)
-		r.write_pass_lang(message);
+		r.write(message);
 	else
 		sendmail(vmail_conf, smtp_server_port, message, from, to, soptions);
 }
@@ -239,8 +222,6 @@ void MMail::configure_user(Request& r) {
 			r.classes_conf.put(type(), mail_element);
 		else
 			if( !mail_element->is_string() )
-				throw Exception(PARSER_RUNTIME,
-					0,
-					"$" MAIL_CLASS_NAME ":" MAIL_NAME " is not hash");
+				throw Exception(PARSER_RUNTIME, 0, "$" MAIL_CLASS_NAME ":" MAIL_NAME " is not hash");
 	}
 }