--- parser3/src/classes/mail.C	2001/10/19 12:43:29	1.41
+++ parser3/src/classes/mail.C	2001/12/19 09:53:28	1.46
@@ -2,9 +2,9 @@
 	Parser: @b mail parser class.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: mail.C,v 1.41 2001/10/19 12:43:29 parser Exp $
+	$Id: mail.C,v 1.46 2001/12/19 09:53:28 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -17,6 +17,8 @@
 #include "pa_request.h"
 #include "pa_vfile.h"
 #include "pa_exec.h"
+#include "pa_charsets.h"
+#include "pa_charset.h"
 
 // defines
 
@@ -125,11 +127,7 @@ static const String& attach_hash_to_stri
 										   Hash& attach_hash) {
 	Pool& pool=r.pool();
 
-	Value *vtype=static_cast<Value *>(attach_hash.get(*new(pool) String(pool, "type")));
-	if(!vtype)
-		throw Exception(0, 0,
-			&origin_string,
-			"has no $type");
+	Value *vformat=static_cast<Value *>(attach_hash.get(*new(pool) String(pool, "format")));
 
 	const VFile *vfile;
 	if(Value *value=static_cast<Value *>(attach_hash.get(*value_name)))
@@ -154,31 +152,21 @@ static const String& attach_hash_to_stri
 	// content-disposition: attachment; filename="user_file_name"
 	result << "content-disposition: attachment; filename=\"" << file_name_cstr << "\"\n";
 
-	const String& type=vtype->as_string();
-	if(type=="uue") {
+	const String *type=vformat?&vformat->as_string():0;
+	if(!type/*default = uue*/ || *type=="uue") {
 		uuencode(result, file_name_cstr, *vfile);
-	} else 
+	} else // for now
 		throw Exception(0, 0,
-			&type,
-			"unknown encode type");
+			type,
+			"unknown attachment encode format");
 	
 	return result;
 }
 
 
-static void *find_content_type(const Hash::Key& aattribute, Hash::Val *ameaning, 
-							  void *) {
-	return StrEqNc(aattribute.cstr(), CONTENT_TYPE_NAME)?ameaning:0;
-}
-static void *find_content_type_charset(const Hash::Key& aattribute, Hash::Val *ameaning, 
-									  void *) {
-	return StrEqNc(aattribute.cstr(), "charset")?ameaning:0;
-}
-
 #ifndef DOXYGEN
 struct Mail_info {
-	String *attribute_to_exclude;
-	const char *charset;
+	Charset *charset;
 	String *header;
 	const String **from, **to;
 };
@@ -190,7 +178,8 @@ static void add_header_attribute(const H
 	Mail_info& mi=*static_cast<Mail_info *>(info);
 
 	// exclude one attribute [body]
-	if(aattribute==*mi.attribute_to_exclude)
+	if(aattribute==BODY_NAME
+		|| aattribute==CHARSET_NAME)
 		return;
 
 	// fetch from & to from header for SMTP
@@ -250,17 +239,17 @@ static const String& letter_hash_to_stri
 	// prepare header: 'hash' without "body"
 	String& result=*new(pool) String(pool);
 
-	const char *charset=0;
-	if(Value *content_type=
-		static_cast<Value *>(letter_hash.first_that(find_content_type)))
-		if(Hash *hash=content_type->get_hash())
-			if(Value *content_type_charset=
-				static_cast<Value *>(hash->first_that(find_content_type_charset)))
-				charset=content_type_charset->as_string().cstr();
+	Charset *charset;
+	if(Value *vcharset_name=static_cast<Value *>(letter_hash.get(*charset_name)))
+		charset=&charsets->get_charset(vcharset_name->as_string());
+	else
+		charset=&pool.get_source_charset();
 
-	*from=*to=0;
+	if(from)
+		*from=0;
+	if(to)
+		*to=0;
 	Mail_info mail_info={
-		/*excluding*/ body_name,
 		charset,
 		&result,
 		from, to
@@ -268,7 +257,7 @@ static const String& letter_hash_to_stri
 	letter_hash.for_each(add_header_attribute, &mail_info);
 
 	if(Value *body_element=static_cast<Value *>(letter_hash.get(*body_name))) {
-		if(Hash *body_hash=body_element->get_hash()) {
+		if(Hash *body_hash=body_element->get_hash(&method_name)) {
 			char *boundary=(char *)pool.malloc(MAX_NUMBER);
 			snprintf(boundary, MAX_NUMBER-5/*lEvEl*/, "lEvEl%d", level);
 			// multi-part
@@ -288,7 +277,7 @@ static const String& letter_hash_to_stri
 				// intermediate boundary
 				result << "\n--" << boundary << "\n";
 
-				if(Hash *part_hash=seq[i].part_value->get_hash())
+				if(Hash *part_hash=seq[i].part_value->get_hash(&method_name))
 					if(seq[i].part_name->mid(0, 6/*attach*/)=="attach")
 						result << attach_hash_to_string(r, *seq[i].part_name, *part_hash);
 					else 
@@ -304,8 +293,17 @@ static const String& letter_hash_to_stri
 			result << "\n--" << boundary << "--\n";
 		} else {
 			result << 
-				"\n" << // header|body separator
-				body_element->as_string().cstr(String::UL_AS_IS);  // body
+				"\n"; // header|body separator
+
+			const String& body=body_element->as_string();
+			const void *body_ptr=body.cstr();  // body
+			size_t body_size=body.size();  // body
+			const void *mail_ptr;
+			size_t mail_size;
+			Charset::transcode(pool, 
+				pool.get_source_charset(), body_ptr, body_size,
+				*charset/*always set - either mail.charset or $request:charset*/, mail_ptr, mail_size);
+			result.APPEND_CLEAN((const char*)mail_ptr, mail_size, 0, 0);
 		}
 	} else 
 		throw Exception(0, 0,
@@ -421,7 +419,7 @@ static void _send(Request& r, const Stri
 	Pool& pool=r.pool();
 
 	Value& vhash=params->as_no_junction(0, "message must not be code");
-	Hash *hash=vhash.get_hash();
+	Hash *hash=vhash.get_hash(&method_name);
 	if(!hash)
 		throw Exception(0, 0,
 			&method_name,
@@ -452,7 +450,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(Hash *mail_conf=mail_element->get_hash())
+		if(Hash *mail_conf=mail_element->get_hash(0))
 			r.classes_conf.put(name(), mail_conf);
 		else
 			throw Exception(0, 0,