--- parser3/src/classes/mail.C	2001/04/10 07:40:46	1.13
+++ parser3/src/classes/mail.C	2001/04/15 13:12:17	1.18
@@ -5,7 +5,7 @@
 
 	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.18 2001/04/15 13:12:17 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -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);
 
@@ -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);
@@ -218,6 +213,7 @@ static const String& letter_hash_to_stri
 
 	// prepare header: 'hash' without "body"
 	String& result=*new(pool) String(pool);
+	*from=*to=0;
 	Mail_info mail_info={
 		/*excluding*/ body_name,
 		&result,
@@ -280,15 +276,15 @@ static void sendmail(Request& r, const S
 
 	char *letter_cstr=letter.cstr();
 
-#ifndef WIN32
+#ifdef WIN32
 	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 +342,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 +370,10 @@ static void sendmail(Request& r, const S
 
 // methods
 
-static void _send(Request& r, const String& method_name, Array *params) {
+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,