--- parser3/src/classes/mail.C 2001/04/07 13:48:35 1.4 +++ parser3/src/classes/mail.C 2001/04/07 15:42:15 1.8 @@ -5,26 +5,82 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: mail.C,v 1.4 2001/04/07 13:48:35 paf Exp $ + $Id: mail.C,v 1.8 2001/04/07 15:42:15 paf Exp $ */ #include "pa_config_includes.h" -#include "_mail.h" -#include "pa_common.h" -#include "pa_request.h" - #ifdef WIN32 # include "smtp/smtp.h" #endif +#include "_mail.h" +#include "pa_common.h" +#include "pa_request.h" +#include "pa_vfile.h" + // global var VStateless_class *mail_class; -// consts +// helpers + +/// +static void uuencode(String& result, const char *file_name_cstr, const VFile& vfile) { + // content-transfer-encoding: x-uuencode + result+="content-transfer-encoding: x-uuencode\n"; + result+="\n"; + result+="todo"; +} + +/// ^mail:send[$attach[$type[uue|mime64] $value[DATA]]] +static const String& attach_hash_to_string(Request& r, const String& origin_string, + Hash& attach_hash) { + Pool& pool=r.pool(); + + Value *vtype=static_cast(attach_hash.get(*new(pool) String(pool, "type"))); + if(!vtype) + PTHROW(0, 0, + &origin_string, + "has no $type"); + + const VFile *vfile; + if(Value *value=static_cast(attach_hash.get(*value_name))) + vfile=value->as_vfile(); + else + PTHROW(0, 0, + &origin_string, + "has no $value"); + + const String *file_name; + if(Value *vfile_name=static_cast(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(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"); + const char *file_name_cstr=file_name->cstr(String::UL_FILE_NAME); + + String& result=*new(pool) String(pool); + + // content-disposition: attachment; filename="user_file_name" + result+="content-disposition: attachment; filename=\""; + result+=file_name_cstr; + result+="\"\n"; + + const String& type=vtype->as_string(); + if(type=="uue") { + uuencode(result, file_name_cstr, *vfile); + } else + PTHROW(0, 0, + &type, + "unknown encode type"); + + return result; +} -// methods struct Mail_info { String *attribute_to_exclude; @@ -55,24 +111,31 @@ static void add_header_attribute(const H *mi.header+="\n"; } struct Seq_item { - const String *part_number; + const String *part_name; Value *part_value; }; -static void add_part(const Hash::Key& part_number, Hash::Val *part_value, +static void add_part(const Hash::Key& part_name, Hash::Val *part_value, void *info) { Seq_item **seq_ref=static_cast(info); - (**seq_ref).part_number=&part_number; + (**seq_ref).part_name=&part_name; (**seq_ref).part_value=static_cast(part_value); (*seq_ref)++; } static double key_of_part(const void *item) { - const char *cstr=static_cast(item)->part_number->cstr(); + const char *cstr=static_cast(item)->part_name->cstr(); char *error_pos; return strtod(cstr, &error_pos); } static int sort_cmp_string_double_value(const void *a, const void *b) { double va=key_of_part(a); double vb=key_of_part(b); + + // 0 logically equals infinity. so that attachments would go last + if(va==0) + return +1; + if(vb==0) + return -1; + if(vavb) @@ -97,11 +160,10 @@ static const String& letter_hash_to_stri if(Value *body_element=static_cast(letter_hash.get(*body_name))) { if(Hash *body_hash=body_element->get_hash()) { char *boundary=(char *)pool.malloc(MAX_NUMBER); - snprintf(boundary, MAX_NUMBER-6/*level_*/, "level_%d", level); + snprintf(boundary, MAX_NUMBER, "%d", level); // multi-part ((result+= - "content-type: multipart/mixed;\n" - " boundary=\"----=")+=boundary)+="\"\n" + "content-type: multipart/mixed; boundary=\"")+=boundary)+="\"\n" "\n" "This is a multi-part message in MIME format."; @@ -115,19 +177,22 @@ static const String& letter_hash_to_stri // ..insert in 'seq' order for(int i=0; isize(); i++) { // intermediate boundary - ((result+="\n------=")+=boundary)+="\n"; + ((result+="\n--")+=boundary)+="\n"; if(Hash *part_hash=seq[i].part_value->get_hash()) - result+=letter_hash_to_string(r, method_name, *part_hash, - level+1, 0, 0); + if(seq[i].part_name->mid(0, 6/*attach*/)=="attach") + result+=attach_hash_to_string(r, *seq[i].part_name, *part_hash); + else + result+=letter_hash_to_string(r, method_name, *part_hash, + level+1, 0, 0); else PTHROW(0, 0, - seq[i].part_number, + seq[i].part_name, "part is not hash"); } // finish boundary - ((result+="\n------=")+=boundary)+="--\n"; + ((result+="\n--")+=boundary)+="--\n"; } else { result+="\n"; // header|body separator result+=body_element->as_string(); // body @@ -140,7 +205,6 @@ static const String& letter_hash_to_stri return result; } - /// @test unix ver static void sendmail(Request& r, const String& method_name, const String& letter, @@ -159,13 +223,15 @@ static void sendmail(Request& r, const S char *letter_cstr=letter.cstr(); SMTP& smtp=*new(pool) SMTP(pool, method_name); - const String *server_port; + Value *server_port; // $MAIN:MAIL.SMTP[mail.design.ru] - if(r.mail && (server_port=r.mail->get_string(*new(pool) String(pool, "SMTP")))) { - char *server=server_port->cstr(); + if(r.mail && + (server_port=static_cast(r.mail->get( + *new(pool) String(pool, "SMTP"))))) { + char *server=server_port->as_string().cstr(); char *port=rsplit(server, ':'); if(!port) - port="25"; + port=const_cast("25"); smtp.Send(server, port, letter_cstr, from->cstr(), to->cstr()); } else @@ -179,6 +245,9 @@ static void sendmail(Request& r, const S #endif } + +// methods + static void _send(Request& r, const String& method_name, Array *params) { Pool& pool=r.pool(); @@ -195,7 +264,8 @@ 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); - sendmail(r, method_name, letter, from, to); + r.write_assign_lang(*new(pool) VString(letter)); + //sendmail(r, method_name, letter, from, to); } // initialize