--- parser3/src/classes/mail.C 2001/12/17 18:44:51 1.45 +++ parser3/src/classes/mail.C 2002/02/06 08:54:22 1.52 @@ -4,15 +4,11 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://paf.design.ru) - $Id: mail.C,v 1.45 2001/12/17 18:44:51 paf Exp $ + $Id: mail.C,v 1.52 2002/02/06 08:54:22 paf Exp $ */ #include "pa_config_includes.h" -#ifdef _MSC_VER -# include "smtp/smtp.h" -#endif - #include "pa_common.h" #include "pa_request.h" #include "pa_vfile.h" @@ -20,6 +16,10 @@ #include "pa_charsets.h" #include "pa_charset.h" +#ifdef _MSC_VER +# include "smtp/smtp.h" +#endif + // defines #define MAIL_CLASS_NAME "mail" @@ -30,6 +30,10 @@ Methoded *mail_class; +// consts + +const int ATTACHMENT_WEIGHT=100; + // class class MMail : public Methoded { @@ -127,11 +131,7 @@ static const String& attach_hash_to_stri Hash& attach_hash) { Pool& pool=r.pool(); - Value *vtype=static_cast(attach_hash.get(*new(pool) String(pool, "type"))); - if(!vtype) - throw Exception(0, 0, - &origin_string, - "has no $type"); + Value *vformat=static_cast(attach_hash.get(*new(pool) String(pool, "format"))); const VFile *vfile; if(Value *value=static_cast(attach_hash.get(*value_name))) @@ -147,7 +147,7 @@ static const String& attach_hash_to_stri file_name=&vfile_name->as_string(); else // no $file-name, VFile surely knows name file_name=&static_cast(vfile->fields().get(*name_name))->as_string(); - const char *file_name_cstr=file_name->cstr(String::UL_FILE_SPEC); + const char *file_name_cstr=file_name->cstr(); String& result=*new(pool) String(pool); @@ -156,13 +156,13 @@ static const String& attach_hash_to_stri // content-disposition: attachment; filename="user_file_name" result << "content-disposition: attachment; filename=\"" << file_name_cstr << "\"\n"; - const String& type=vtype->as_string(); - if(type=="uue") { + const String *type=vformat?&vformat->as_string():0; + if(!type/*default = uue*/ || *type=="uue") { uuencode(result, file_name_cstr, *vfile); - } else + } else // for now throw Exception(0, 0, - &type, - "unknown encode type"); + type, + "unknown attachment encode format"); return result; } @@ -202,38 +202,40 @@ static void add_header_attribute(const H #ifndef DOXYGEN struct Mail_seq_item { - const String *part_name; - Value *part_value; + int weight; + const String *name; + Value *value; }; #endif +static int get_part_name_weight(const Hash::Key& part_name) { + const char *cstr=part_name.cstr(); + int offset=0; + if(strncmp(cstr, "text", 4)==0) { + cstr+=4; + } else if(strncmp(cstr, "attach", 6)==0) { + cstr+=6; + offset=ATTACHMENT_WEIGHT; + } else + throw Exception(0, 0, + &part_name, + "is neither text# nor attach#"); + + char *error_pos; + return strtol(cstr, &error_pos, 10)+offset; +} static void add_part(const Hash::Key& part_name, Hash::Val *part_value, void *info) { Mail_seq_item **seq_ref=static_cast(info); - (**seq_ref).part_name=&part_name; - (**seq_ref).part_value=static_cast(part_value); + (**seq_ref).weight=get_part_name_weight(part_name); + (**seq_ref).name=&part_name; + (**seq_ref).value=static_cast(part_value); (*seq_ref)++; } -static double key_of_part(const void *item) { - const char *cstr=static_cast(item)->part_name->cstr(); - char *error_pos; - return strtod(cstr, &error_pos); +static int key_of_part(const void *item) { + return static_cast(item)->weight; } 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) - return +1; - else - return 0; + return key_of_part(a)-key_of_part(b); } static const String& letter_hash_to_string(Request& r, const String& method_name, Hash& letter_hash, int level, @@ -249,7 +251,10 @@ static const String& letter_hash_to_stri else charset=&pool.get_source_charset(); - *from=*to=0; + if(from) + *from=0; + if(to) + *to=0; Mail_info mail_info={ charset, &result, @@ -259,13 +264,6 @@ 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(&method_name)) { - char *boundary=(char *)pool.malloc(MAX_NUMBER); - snprintf(boundary, MAX_NUMBER-5/*lEvEl*/, "lEvEl%d", level); - // multi-part - result << "content-type: multipart/mixed; boundary=\"" << boundary << "\"\n"; - result << "\n" - "This is a multi-part message in MIME format."; - // body parts.. // ..collect Mail_seq_item *seq=(Mail_seq_item *)pool.malloc(sizeof(Mail_seq_item)*body_hash->size()); @@ -273,25 +271,42 @@ static const String& letter_hash_to_stri // ..sort _qsort(seq, body_hash->size(), sizeof(Mail_seq_item), sort_cmp_string_double_value); + + bool multipart=body_hash->size()>1; + // header + char *boundary=0; + if(multipart) { + boundary=(char *)pool.malloc(MAX_NUMBER); + snprintf(boundary, MAX_NUMBER-5/*lEvEl*/, "lEvEl%d", level); + // multi-part + result << "content-type: multipart/mixed; boundary=\"" << boundary << "\"\n"; + result << "\n" + "This is a multi-part message in MIME format."; + } + // ..insert in 'seq' order for(int i=0; isize(); i++) { - // intermediate boundary - result << "\n--" << boundary << "\n"; - - if(Hash *part_hash=seq[i].part_value->get_hash(&method_name)) - if(seq[i].part_name->mid(0, 6/*attach*/)=="attach") - result << attach_hash_to_string(r, *seq[i].part_name, *part_hash); + if(multipart) { + // intermediate boundary + result << "\n--" << boundary << "\n"; + } + + if(Hash *part_hash=seq[i].value->get_hash(&method_name)) + if(seq[i].weight>=ATTACHMENT_WEIGHT) + result << attach_hash_to_string(r, *seq[i].name, *part_hash); else result << letter_hash_to_string(r, method_name, *part_hash, level+1, 0, 0); else throw Exception(0, 0, - seq[i].part_name, + seq[i].name, "part is not hash"); } // finish boundary - result << "\n--" << boundary << "--\n"; + if(multipart) { + result << "\n--" << boundary << "--\n"; + } } else { result << "\n"; // header|body separator @@ -350,66 +365,57 @@ static void sendmail(Request& r, const S "$"MAIN_CLASS_NAME":"MAIL_NAME".SMTP not defined"); #else // unix - // $MAIN:MAIL.prog1["/usr/sbin/sendmail -t"] default - // $MAIN:MAIL.prog2["/usr/lib/sendmail -t"] default - char no_cstr[MAX_NUMBER]; - for(int no=-2; ; no++) { - const String *prog_string; - switch(no) { - case -2: prog_string=new(pool) String(pool, "/usr/sbin/sendmail -t"); break; - case -1: prog_string=new(pool) String(pool, "/usr/lib/sendmail -t"); break; - default: - { - String prog_key(pool, "prog"); - snprintf(no_cstr, MAX_NUMBER, "%d", no); - prog_key << no_cstr; - if(mail_conf) { - if(Value *prog_value=static_cast(mail_conf->get(prog_key))) - prog_string=&prog_value->as_string(); - else - if(no==0) - continue; - else - throw Exception(0, 0, - &method_name, - "$"MAIN_CLASS_NAME":"MAIL_NAME".%s not defined", - prog_key.cstr()); - } else - throw Exception(0, 0, - &method_name, - "$" MAIN_CLASS_NAME ":" MAIL_NAME " not defined"); - } - } - // we know prog_string here - Array argv(pool); - const String *file_spec; - int after_file_spec=prog_string->pos(" ", 1); - if(after_file_spec<=0) - file_spec=prog_string; - else { - size_t pos_after=after_file_spec; - file_spec=&prog_string->mid(0, pos_after); - prog_string->split(argv, &pos_after, " ", 1, String::UL_CLEAN); - } + // $MAIN:MAIL.sendmail["/usr/sbin/sendmail -t"] default + // $MAIN:MAIL.sendmail["/usr/lib/sendmail -t"] default - // skip unavailable default programs - if(no<0 && !file_executable(*file_spec)) - continue; - - String in(pool, letter_cstr); String out(pool); String err(pool); - int exit_status=pa_exec(*file_spec, - 0/*default env*/, - &argv, - in, out, err); - if(exit_status || err.size()) + const char *sendmailkey_cstr="sendmail"; + const String *sendmail_command; + if(mail_conf) { + if(Value *sendmail_value=static_cast(mail_conf->get(String(pool, sendmailkey_cstr)))) + sendmail_command=&sendmail_value->as_string(); + else throw Exception(0, 0, &method_name, - "'%s' reported problem: %s (%d)", - file_spec->cstr(), - err.size()?err.cstr():"UNKNOWN", - exit_status); - break; + "$"MAIN_CLASS_NAME":"MAIL_NAME".%s not defined", + sendmailkey_cstr); + } else { + String *test=new(pool) String(pool, "/usr/sbin/sendmail"); + if(!file_executable(*test)) + test=new(pool) String(pool, "/usr/lib/sendmail"); + test->APPEND_CONST(" -t"); + sendmail_command=test; + } + + // we know sendmail_command here + Array argv(pool); + const String *file_spec; + int after_file_spec=sendmail_command->pos(" ", 1); + if(after_file_spec<=0) + file_spec=sendmail_command; + else { + size_t pos_after=after_file_spec; + file_spec=&sendmail_command->mid(0, pos_after++); + sendmail_command->split(argv, &pos_after, " ", 1, String::UL_AS_IS); } + + if(!file_executable(*file_spec)) + throw Exception(0, 0, + file_spec, + "is not executable. Set $"MAIN_CLASS_NAME":"MAIL_NAME".%s with appropriate sendmail command", + sendmailkey_cstr); + + String in(pool, letter_cstr); String out(pool); String err(pool); + int exit_status=pa_exec(*file_spec, + 0/*default env*/, + &argv, + in, out, err); + if(exit_status || err.size()) + throw Exception(0, 0, + &method_name, + "'%s' reported problem: %s (%d)", + file_spec->cstr(), + err.size()?err.cstr():"UNKNOWN", + exit_status); #endif }