--- parser3/src/classes/mail.C	2001/04/26 14:55:12	1.22
+++ parser3/src/classes/mail.C	2001/08/24 06:26:13	1.35
@@ -5,8 +5,9 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: mail.C,v 1.22 2001/04/26 14:55:12 paf Exp $
+	$Id: mail.C,v 1.35 2001/08/24 06:26:13 parser Exp $
 */
+static const char *RCSId="$Id: mail.C,v 1.35 2001/08/24 06:26:13 parser Exp $"; 
 
 #include "pa_config_includes.h"
 
@@ -14,15 +15,34 @@
 #	include "smtp/smtp.h"
 #endif
 
-#include "_mail.h"
 #include "pa_common.h"
 #include "pa_request.h"
 #include "pa_vfile.h"
 #include "pa_exec.h"
 
-// global var
+// defines
 
-VStateless_class *mail_class;
+#define MAIL_CLASS_NAME "mail"
+
+#define MAIL_NAME "MAIL"
+
+// global variable
+
+Methoded *mail_class;
+
+// class
+
+class MMail : public Methoded {
+public:
+	MMail(Pool& pool);
+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
 
@@ -100,7 +120,9 @@ static void uuencode(String& result, con
 		"end\n";
 }
 
-/// ^mail:send[$attach[$type[uue|mime64] $value[DATA]]] 
+/** ^mail:send[$attach[$type[uue|mime64] $value[DATA]]] 
+	@todo solve - bad with html attaches
+*/
 static const String& attach_hash_to_string(Request& r, const String& origin_string, 
 										   Hash& attach_hash) {
 	Pool& pool=r.pool();
@@ -146,13 +168,13 @@ static const String& attach_hash_to_stri
 }
 
 
-static bool find_content_type(const Hash::Key& aattribute, Hash::Val *ameaning, 
+static void *find_content_type(const Hash::Key& aattribute, Hash::Val *ameaning, 
 							  void *) {
-	return StrEqNc(aattribute.cstr(), CONTENT_TYPE_NAME);
+	return StrEqNc(aattribute.cstr(), CONTENT_TYPE_NAME)?ameaning:0;
 }
-static bool find_content_type_charset(const Hash::Key& aattribute, Hash::Val *ameaning, 
+static void *find_content_type_charset(const Hash::Key& aattribute, Hash::Val *ameaning, 
 									  void *) {
-	return StrEqNc(aattribute.cstr(), "charset");
+	return StrEqNc(aattribute.cstr(), "charset")?ameaning:0;
 }
 
 /// used by mail: _send / letter_hash_to_string / add_header_attribute
@@ -187,19 +209,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);
 }
@@ -256,10 +278,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 *)pool.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++) {
@@ -299,6 +321,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)
@@ -312,9 +335,9 @@ 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(
+	// $MAIN:MAIL.SMTP[mail.yourdomain.ru[:port]]
+	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, ':');
@@ -330,7 +353,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;
@@ -342,7 +365,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)
@@ -387,18 +410,17 @@ static void sendmail(Request& r, const S
 	} else
 		PTHROW(0, 0,
 			&method_name,
-			"$"MAIN_CLASS_NAME":"MAIL_NAME" not defined");
+			"$" MAIN_CLASS_NAME ":" MAIL_NAME " not defined");
 #endif
 }
 
 
 // methods
 
-/// ^mail:send{hash}
 static void _send(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	Value& vhash=params->get_no_junction(0, "message must not be code");
+	Value& vhash=params->as_no_junction(0, "message must not be code");
 	Hash *hash=vhash.get_hash();
 	if(!hash)
 		PTHROW(0, 0,
@@ -412,8 +434,34 @@ static void _send(Request& r, const Stri
 	sendmail(r, method_name, letter, from, to);
 }
 
-// initialize
-void initialize_mail_class(Pool& pool, VStateless_class& vclass) {
-	/// ^mail:send{hash}
-	vclass.add_native_method("send", Method::CT_STATIC, _send, 1, 1);
+// constructor & configurator
+
+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}
+	add_native_method("send", Method::CT_STATIC, _send, 1, 1);
+}
+
+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(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");
+}
+
+// creator
+
+Methoded *MMail_create(Pool& pool) {
+	return mail_class=new(pool) MMail(pool);
 }