--- parser3/src/classes/mail.C	2004/09/01 09:16:57	1.105
+++ 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-2004 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: 2004/09/01 09:16:57 $";
+static const char * const IDENT_MAIL_C="$Date: 2009/07/06 12:13:30 $";
 
 #include "pa_config_includes.h"
 #include "pa_vmethod_frame.h"
@@ -21,6 +21,10 @@ static const char * const IDENT_MAIL_C="
 
 #include "smtp.h"
 
+// debug switches
+
+//#define DEBUG_JUST_SEE_MESSAGE
+
 // defines
 
 #define MAIL_CLASS_NAME "mail"
@@ -69,7 +73,7 @@ static void sendmail(
 			 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}
@@ -94,7 +98,7 @@ static void sendmail(
 
 #if WIN32
 	// win32 without SMTP server configured
-	throw Exception("parser.runtime",
+	throw Exception(PARSER_RUNTIME,
 		0,
 		"$"MAIN_CLASS_NAME":"MAIL_NAME".SMTP not defined");
 #else
@@ -105,7 +109,7 @@ static void sendmail(
 	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");
@@ -113,7 +117,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",
+			throw Exception(PARSER_RUNTIME,
 				0,
 				"$"MAIN_CLASS_NAME":"MAIL_NAME"."SENDMAIL_NAME" not defined");
 #endif
@@ -192,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");
 
@@ -214,9 +218,12 @@ 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);
-	/*sendmail(vmail_conf, smtp_server_port, 
-		message, from, to, soptions);*/
+#else
+	sendmail(vmail_conf, smtp_server_port, 
+		message, from, to, soptions);
+#endif
 }
 
 // constructor & configurator
@@ -234,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");
 }