--- parser3/src/classes/mail.C	2015/10/09 11:42:38	1.124
+++ parser3/src/classes/mail.C	2016/11/28 22:42:57	1.132
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b mail parser class.
 
-	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
@@ -19,7 +19,7 @@
 
 #include "smtp.h"
 
-volatile const char * IDENT_MAIL_C="$Id: mail.C,v 1.124 2015/10/09 11:42:38 moko Exp $";
+volatile const char * IDENT_MAIL_C="$Id: mail.C,v 1.132 2016/11/28 22:42:57 moko Exp $";
 
 // defines
 
@@ -43,7 +43,7 @@ public:
 
 // global variable
 
-DECLARE_CLASS_VAR(mail, 0/*fictive*/, new MMail);
+DECLARE_CLASS_VAR(mail, new MMail);
 
 // defines for statics
 
@@ -98,7 +98,7 @@ static void sendmail(
 	// win32 without SMTP server configured
 	throw Exception(PARSER_RUNTIME,
 		0,
-		"$"MAIN_CLASS_NAME":"MAIL_NAME".SMTP not defined");
+		"$" MAIN_CLASS_NAME ":" MAIL_NAME ".SMTP not defined");
 #else
 	// unix
 	// $MAIN:MAIL.sendmail["/usr/sbin/sendmail -t -i -f postmaster"] default
@@ -149,9 +149,8 @@ static void sendmail(
 	if(after_file_spec==STRING_NOT_FOUND || after_file_spec==0)
 		file_spec=sendmail_command;
 	else {
-		size_t pos_after=after_file_spec;
-		file_spec=&sendmail_command->mid(0, pos_after++);
-		sendmail_command->split(argv, pos_after, " ", String::L_AS_IS);
+		file_spec=&sendmail_command->mid(0, after_file_spec);
+		sendmail_command->split(argv, after_file_spec+1, " ", String::L_AS_IS);
 	}
 
 	if(!file_executable(*file_spec))
@@ -165,8 +164,6 @@ static void sendmail(
 #endif
 		);
 
-
-	String in(message_cstr);
 	PA_exec_result exec=pa_exec(
 		// forced_allow
 #ifdef PA_FORCED_SENDMAIL
@@ -177,14 +174,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
 }
 
@@ -205,7 +198,7 @@ static void _send(Request& r, MethodPara
 	if(Value* vdebug=hash->get(MAIL_DEBUG_NAME))
 		print_debug=vdebug->as_bool();
 
-	Value* vmail_conf=static_cast<Value*>(r.classes_conf.get(mail_base_class->name()));
+	Value* vmail_conf=static_cast<Value*>(r.classes_conf.get(mail_class->type()));
 	Value* smtp_server_port=0;
 	if(vmail_conf) {
 		// $MAIN:MAIL.SMTP[mail.yourdomain.ru[:port]]
@@ -220,7 +213,7 @@ static void _send(Request& r, MethodPara
 			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);
 }
@@ -237,7 +230,7 @@ void MMail::configure_user(Request& r) {
 	// $MAIN:MAIL[$SMTP[mail.design.ru]]
 	if(Value* mail_element=r.main_class.get_element(mail_name)) {
 		if(mail_element->get_hash())
-			r.classes_conf.put(name(), mail_element);
+			r.classes_conf.put(type(), mail_element);
 		else
 			if( !mail_element->is_string() )
 				throw Exception(PARSER_RUNTIME,