--- parser3/src/classes/mail.C	2001/04/10 07:40:46	1.13
+++ parser3/src/classes/mail.C	2001/04/26 14:55:12	1.22
@@ -5,12 +5,12 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: mail.C,v 1.13 2001/04/10 07:40:46 paf Exp $
+	$Id: mail.C,v 1.22 2001/04/26 14:55:12 paf Exp $
 */
 
 #include "pa_config_includes.h"
 
-#ifdef WIN32
+#ifdef _MSC_VER
 #	include "smtp/smtp.h"
 #endif
 
@@ -44,15 +44,13 @@ static void uuencode(String& result, con
 	result << "begin 644 " << file_name_cstr << "\n";
 
 	//body
-	const unsigned char *itemp;
-
-	int index;
-	int count=45;
-
 	const unsigned char *in=(const unsigned char *)vfile.value_ptr();
 	size_t in_length=vfile.value_size();
 
-	for(itemp=in; itemp<(in+in_length); itemp+=count) {
+	int count=45;
+	for(const unsigned char *itemp=in; itemp<(in+in_length); itemp+=count) {
+		int index;	
+
 		if((itemp+count)>(in+in_length)) 
 			count=in_length-(itemp-in);
 
@@ -98,7 +96,7 @@ static void uuencode(String& result, con
 	}
 	
 	//footer
-	result.APPEND_CLEAN((const char *)uue_table, 1/* one char */, 0, 0) << "\n"
+	result.APPEND_AS_IS((const char *)uue_table, 1/* one char */, 0, 0) << "\n"
 		"end\n";
 }
 
@@ -115,7 +113,7 @@ static const String& attach_hash_to_stri
 
 	const VFile *vfile;
 	if(Value *value=static_cast<Value *>(attach_hash.get(*value_name)))
-		vfile=value->as_vfile();
+		vfile=value->as_vfile(String::UL_AS_IS); // bad with html attaches. todo: solve
 	else
 		PTHROW(0, 0,
 			&origin_string,
@@ -125,11 +123,8 @@ static const String& attach_hash_to_stri
 	if(Value *vfile_name=static_cast<Value *>(attach_hash.get(
 		*new(pool) String(pool, "file-name")))) // specified $file-name
 		file_name=&vfile_name->as_string();
-	else // no $file-name
-		if(Value *vfile_name=static_cast<Value *>(vfile->fields().get(*name_name)))
-			file_name=&vfile_name->as_string(); // VFile knows name
-		else // vfile doesn't know name
-			file_name=new(pool) String(pool, "noname.dat");
+	else // no $file-name, VFile surely knows name
+		file_name=&static_cast<Value *>(vfile->fields().get(*name_name))->as_string();
 	const char *file_name_cstr=file_name->cstr(String::UL_FILE_NAME);
 
 	String& result=*new(pool) String(pool);
@@ -151,8 +146,19 @@ static const String& attach_hash_to_stri
 }
 
 
+static bool find_content_type(const Hash::Key& aattribute, Hash::Val *ameaning, 
+							  void *) {
+	return StrEqNc(aattribute.cstr(), CONTENT_TYPE_NAME);
+}
+static bool find_content_type_charset(const Hash::Key& aattribute, Hash::Val *ameaning, 
+									  void *) {
+	return StrEqNc(aattribute.cstr(), "charset");
+}
+
+/// used by mail: _send / letter_hash_to_string / add_header_attribute
 struct Mail_info {
 	String *attribute_to_exclude;
+	const char *charset;
 	String *header;
 	const String **from, **to;
 };
@@ -175,9 +181,12 @@ static void add_header_attribute(const H
 	// append header line
 	*mi.header << 
 		aattribute << ":" << 
-		attributed_meaning_to_string(lmeaning, String::UL_MAIL_HEADER) << 
+		attributed_meaning_to_string(lmeaning, String::UL_MAIL_HEADER).
+			cstr(String::UL_UNSPECIFIED, 0, mi.charset) << 
 		"\n";
 }
+
+/// used in mail: _send / letter_hash_to_string / add_part
 struct Seq_item {
 	const String *part_name;
 	Value *part_value;
@@ -218,8 +227,19 @@ 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();
+
+	*from=*to=0;
 	Mail_info mail_info={
 		/*excluding*/ body_name,
+		charset,
 		&result,
 		from, to
 	};
@@ -280,15 +300,15 @@ static void sendmail(Request& r, const S
 
 	char *letter_cstr=letter.cstr();
 
-#ifndef WIN32
+#ifdef _MSC_VER
 	if(!from)
 		PTHROW(0, 0,
 			&method_name,
-			"not specified 'from'");
+			"has no 'from' header specified");
 	if(!to)
 		PTHROW(0, 0,
 			&method_name,
-			"not specified 'to'");
+			"has no 'to' header specified");
 
 	SMTP& smtp=*new(pool) SMTP(pool, method_name);
 	Value *server_port;
@@ -346,8 +366,8 @@ static void sendmail(Request& r, const S
 				prog_string->split(argv, &pos_after, " ", 1, String::UL_CLEAN);
 			}
 
-			// skip unavailable
-			if(!file_executable(*file_spec))
+			// skip unavailable default programs
+			if(no<0 && !file_executable(*file_spec))
 				continue;
 
 			String in(pool, letter_cstr); String out(pool); String err(pool);
@@ -374,13 +394,11 @@ static void sendmail(Request& r, const S
 
 // methods
 
-static void _send(Request& r, const String& method_name, Array *params) {
+/// ^mail:send{hash}
+static void _send(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	Value& vhash=*static_cast<Value *>(params->get(0));
-	// forcing [this body type]
-	r.fail_if_junction_(true, vhash, method_name, "message must not be code");
-
+	Value& vhash=params->get_no_junction(0, "message must not be code");
 	Hash *hash=vhash.get_hash();
 	if(!hash)
 		PTHROW(0, 0,
@@ -390,12 +408,12 @@ static void _send(Request& r, const Stri
 	const String *from, *to;
 	const String& letter=letter_hash_to_string(r, method_name, *hash, 0, &from, &to);
 
-	//r.write_assign_lang(*new(pool) VString(letter));
+//	r.write_assign_lang(*new(pool) VString(letter));
 	sendmail(r, method_name, letter, from, to);
 }
 
 // initialize
 void initialize_mail_class(Pool& pool, VStateless_class& vclass) {
-	// ^mail:send{hash}
+	/// ^mail:send{hash}
 	vclass.add_native_method("send", Method::CT_STATIC, _send, 1, 1);
 }