--- parser3/src/classes/mail.C	2001/04/28 10:58:26	1.24
+++ parser3/src/classes/mail.C	2001/05/08 10:23:49	1.28
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: mail.C,v 1.24 2001/04/28 10:58:26 paf Exp $
+	$Id: mail.C,v 1.28 2001/05/08 10:23:49 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -23,6 +23,12 @@
 
 #define MAIL_CLASS_NAME "mail"
 
+#define MAIL_NAME "MAIL"
+
+// global variable
+
+Methoded *mail_class;
+
 // class
 
 class MMail : public Methoded {
@@ -31,6 +37,10 @@ public:
 public: // Methoded
 	bool used_directly() { return true; }
 	void configure_user(Request& r);
+private:
+	String mail_name;
+	String content_disposition_name;
+	String content_disposition_filename_name;
 };
 
 // helpers
@@ -196,19 +206,19 @@ static void add_header_attribute(const H
 }
 
 /// used in mail: _send / letter_hash_to_string / add_part
-struct Seq_item {
+struct Mail_seq_item {
 	const String *part_name;
 	Value *part_value;
 };
 static void add_part(const Hash::Key& part_name, Hash::Val *part_value, 
 					 void *info) {
-	Seq_item **seq_ref=static_cast<Seq_item **>(info);
+	Mail_seq_item **seq_ref=static_cast<Mail_seq_item **>(info);
 	(**seq_ref).part_name=&part_name;
 	(**seq_ref).part_value=static_cast<Value *>(part_value);
 	(*seq_ref)++;
 }
 static double key_of_part(const void *item) {
-	const char *cstr=static_cast<const Seq_item *>(item)->part_name->cstr();
+	const char *cstr=static_cast<const Mail_seq_item *>(item)->part_name->cstr();
 	char *error_pos;
 	return strtod(cstr, &error_pos);
 }
@@ -265,10 +275,10 @@ static const String& letter_hash_to_stri
 
 			// body parts..
 			// ..collect
-			Seq_item *seq=(Seq_item *)malloc(sizeof(Seq_item)*body_hash->size());
-			Seq_item *seq_ref=seq;  body_hash->for_each(add_part, &seq_ref);
+			Mail_seq_item *seq=(Mail_seq_item *)malloc(sizeof(Mail_seq_item)*body_hash->size());
+			Mail_seq_item *seq_ref=seq;  body_hash->for_each(add_part, &seq_ref);
 			// ..sort
-			_qsort(seq, body_hash->size(), sizeof(Seq_item), 
+			_qsort(seq, body_hash->size(), sizeof(Mail_seq_item), 
 				sort_cmp_string_double_value);
 			// ..insert in 'seq' order
 			for(int i=0; i<body_hash->size(); i++) {
@@ -308,6 +318,7 @@ static void sendmail(Request& r, const S
 	Pool& pool=r.pool();
 
 	char *letter_cstr=letter.cstr();
+	Hash *mail_conf=static_cast<Hash *>(r.classes_conf.get(mail_class->name()));
 
 #ifdef _MSC_VER
 	if(!from)
@@ -322,8 +333,8 @@ static void sendmail(Request& r, const S
 	SMTP& smtp=*new(pool) SMTP(pool, method_name);
 	Value *server_port;
 	// $MAIN:MAIL.SMTP[mail.design.ru]
-	if(r.mail && 
-		(server_port=static_cast<Value *>(r.mail->get(
+	if(mail_conf && 
+		(server_port=static_cast<Value *>(mail_conf->get(
 			*new(pool) String(pool, "SMTP"))))) {
 		char *server=server_port->as_string().cstr();
 		const char *port=rsplit(server, ':');
@@ -339,7 +350,7 @@ static void sendmail(Request& r, const S
 	// unix
 	// $MAIN:MAIL.prog1["/usr/sbin/sendmail -t"] default
 	// $MAIN:MAIL.prog2["/usr/lib/sendmail -t"] default
-	if(r.mail) {
+	if(mail_conf) {
 		char no_cstr[MAX_NUMBER];
 		for(int no=-2; ; no++) {
 			const String *prog_string;
@@ -351,7 +362,7 @@ static void sendmail(Request& r, const S
 					String prog_key(pool, "prog");
 					snprintf(no_cstr, MAX_NUMBER, "%d", no);
 					prog_key << no_cstr;
-					if(Value *prog_value=static_cast<Value *>(r.mail->get(prog_key)))
+					if(Value *prog_value=static_cast<Value *>(mail_conf->get(prog_key)))
 						prog_string=&prog_value->as_string();
 					else
 						if(no==0)
@@ -403,7 +414,6 @@ static void sendmail(Request& r, const S
 
 // methods
 
-/// ^mail:send{hash}
 static void _send(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -423,10 +433,14 @@ static void _send(Request& r, const Stri
 
 // constructor & configurator
 
-MMail::MMail(Pool& apool) : Methoded(apool) {
+MMail::MMail(Pool& apool) : Methoded(apool),
+	mail_name(apool, MAIL_NAME),
+	content_disposition_name(apool, CONTENT_DISPOSITION_NAME),
+	content_disposition_filename_name(apool, CONTENT_DISPOSITION_FILENAME_NAME)
+{
 	set_name(*NEW String(pool(), MAIL_CLASS_NAME));
 
-	/// ^mail:send{hash}
+	// ^mail:send{hash}
 	add_native_method("send", Method::CT_STATIC, _send, 1, 1);
 }
 
@@ -434,17 +448,15 @@ void MMail::configure_user(Request& r) {
 	Pool& pool=r.pool();
 
 	// $MAIN:MAIL[$SMTP[mail.design.ru]]
-	if(Value *mail_element=r.main_class->get_element(*mail_name))
-		if(!(r.mail=mail_element->get_hash()))
+	if(Value *mail_element=r.main_class->get_element(mail_name))
+		if(Hash *mail_conf=mail_element->get_hash())
+			r.classes_conf.put(name(), mail_conf);
+		else
 			PTHROW(0, 0,
 				0,
 				"$" MAIL_CLASS_NAME ":" MAIL_NAME " is not hash");
 }
 
-// global variable
-
-Methoded *mail_class;
-
 // creator
 
 Methoded *MMail_create(Pool& pool) {