--- parser3/src/classes/mail.C	2004/12/08 08:47:35	1.109
+++ parser3/src/classes/mail.C	2013/07/31 15:13:03	1.121
@@ -1,12 +1,10 @@
 /** @file
 	Parser: @b mail parser class.
 
-	Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_MAIL_C="$Date: 2004/12/08 08:47:35 $";
-
 #include "pa_config_includes.h"
 #include "pa_vmethod_frame.h"
 
@@ -21,9 +19,7 @@ static const char * const IDENT_MAIL_C="
 
 #include "smtp.h"
 
-// debug switches
-
-//#define DEBUG_JUST_SEE_MESSAGE
+volatile const char * IDENT_MAIL_C="$Id: mail.C,v 1.121 2013/07/31 15:13:03 moko Exp $";
 
 // defines
 
@@ -66,20 +62,22 @@ static void sendmail(
 			vmail_conf
 #endif
 			, Value* smtp_server_port,
-		     const String& message, 
-		     const String* from, const String* to,
-			 const String* 
-#ifndef _MSC_VER
+			const String& message, 
+			const String* from,
+			const String* to,
+			const String* 
+#ifndef WIN32
 			 options
 #endif
 			 ) {
-	const char* message_cstr=message.cstr(String::L_UNSPECIFIED);
-
 	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");
+
+	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,
@@ -96,9 +94,9 @@ static void sendmail(
 		return;
 	}
 
-#if WIN32
+#ifdef WIN32
 	// win32 without SMTP server configured
-	throw Exception("parser.runtime",
+	throw Exception(PARSER_RUNTIME,
 		0,
 		"$"MAIN_CLASS_NAME":"MAIL_NAME".SMTP not defined");
 #else
@@ -109,7 +107,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");
@@ -117,7 +115,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
@@ -187,23 +185,26 @@ static void sendmail(
 				file_spec->cstr(),
 				exec.err.length()?exec.err.cstr():"UNKNOWN", 
 				exec.status);
-#endif
+#endif //WIN32
 }
 
 // methods
 
 static void _send(Request& r, MethodParams& params) {
-	Value& vhash=params.as_no_junction(0, "message must not be code");
-	HashStringValue* hash=vhash.get_hash();
-	if(!hash)
-		throw Exception("parser.runtime",
-			0,
-			"message must be hash");
+	HashStringValue* hash=params.as_hash(0, "message");
+	if(!hash || !hash->count())
+		return;
+	// todo@ check if enough options are specified.
+	// now ^mail:send[^hash::create[]] and ^mail:send[$.print-debug(1)] "work".
 
 	const String* soptions=0;
 	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,12 +235,12 @@ 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
 			if( !mail_element->is_string() )
-				throw Exception("parser.runtime",
+				throw Exception(PARSER_RUNTIME,
 					0,
 					"$" MAIL_CLASS_NAME ":" MAIL_NAME " is not hash");
 }