--- parser3/src/classes/mail.C	2013/07/31 15:13:03	1.121
+++ parser3/src/classes/mail.C	2016/09/08 20:41:47	1.129
@@ -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.121 2013/07/31 15:13:03 moko Exp $";
+volatile const char * IDENT_MAIL_C="$Id: mail.C,v 1.129 2016/09/08 20:41:47 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
 
@@ -109,7 +109,7 @@ static void sendmail(
 #ifdef PA_FORCED_SENDMAIL
 		throw Exception(PARSER_RUNTIME,
 			0,
-			"Parser was configured with --with-sendmail="PA_FORCED_SENDMAIL
+			"Parser was configured with --with-sendmail=" PA_FORCED_SENDMAIL
 			" key, to change sendmail you should reconfigure and recompie it");
 #else
 		if(Value* sendmail_value=vmail_conf->get_hash()->get(mail_sendmail_name))
@@ -117,7 +117,7 @@ static void sendmail(
 		else
 			throw Exception(PARSER_RUNTIME,
 				0,
-				"$"MAIN_CLASS_NAME":"MAIL_NAME"."SENDMAIL_NAME" not defined");
+				"$" MAIN_CLASS_NAME ":" MAIL_NAME "." SENDMAIL_NAME " not defined");
 #endif
 	} else {
 #ifdef PA_FORCED_SENDMAIL
@@ -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))
@@ -161,7 +160,7 @@ static void sendmail(
 #ifdef PA_FORCED_SENDMAIL
 			" Use configure key \"--with-sendmail=appropriate sendmail command\""
 #else
-			" Set $"MAIN_CLASS_NAME":"MAIL_NAME"."SENDMAIL_NAME" to appropriate sendmail command"
+			" Set $" MAIN_CLASS_NAME ":" MAIL_NAME "." SENDMAIL_NAME " to appropriate sendmail command"
 #endif
 		);
 
@@ -205,11 +204,11 @@ 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]]
-		smtp_server_port=vmail_conf->get_hash()->get(String::Body("SMTP"));
+		smtp_server_port=vmail_conf->get_hash()->get("SMTP");
 	}
 
 
@@ -235,12 +234,13 @@ MMail::MMail(): Methoded(MAIL_CLASS_NAME
 void MMail::configure_user(Request& r) {
 
 	// $MAIN:MAIL[$SMTP[mail.design.ru]]
-	if(Value* mail_element=r.main_class.get_element(mail_name))
+	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,
 					0,
 					"$" MAIL_CLASS_NAME ":" MAIL_NAME " is not hash");
+	}
 }