--- parser3/src/classes/mail.C	2007/04/23 10:30:09	1.111
+++ parser3/src/classes/mail.C	2009/09/27 22:10:12	1.115
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b mail parser class.
 
-	Copyright (c) 2001-2005 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: 2007/04/23 10:30:09 $";
+static const char * const IDENT_MAIL_C="$Date: 2009/09/27 22:10:12 $";
 
 #include "pa_config_includes.h"
 #include "pa_vmethod_frame.h"
@@ -21,10 +21,6 @@ static const char * const IDENT_MAIL_C="
 
 #include "smtp.h"
 
-// debug switches
-
-//#define DEBUG_JUST_SEE_MESSAGE
-
 // defines
 
 #define MAIL_CLASS_NAME "mail"
@@ -66,14 +62,15 @@ static void sendmail(
 			vmail_conf
 #endif
 			, Value* smtp_server_port,
-		     const String& message, 
-		     const String* from, const String* to,
-			 const String* 
+			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);
+	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}
@@ -204,6 +201,10 @@ static void _send(Request& r, MethodPara
 	if(Value* voptions=hash->get(MAIL_OPTIONS_NAME))
 		soptions=&voptions->as_string();
 
+	bool print_debug=false;
+	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* smtp_server_port=0;
 	if(vmail_conf) {
@@ -218,12 +219,10 @@ static void _send(Request& r, MethodPara
 		GET_SELF(r, VMail).message_hash_to_string(r, hash, 0, from, 
 			smtp_server_port?true:false /*send by SMTP=strip to?*/, to);
 
-#ifdef DEBUG_JUST_SEE_MESSAGE
-	r.write_pass_lang(message);
-#else
-	sendmail(vmail_conf, smtp_server_port, 
-		message, from, to, soptions);
-#endif
+	if(print_debug)
+		r.write_pass_lang(message);
+	else
+		sendmail(vmail_conf, smtp_server_port, message, from, to, soptions);
 }
 
 // constructor & configurator
@@ -236,7 +235,7 @@ 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, r.main_class, false))
+	if(Value* mail_element=r.main_class.get_element(mail_name))
 		if(mail_element->get_hash())
 			r.classes_conf.put(name(), mail_element);
 		else