--- parser3/src/classes/mail.C 2001/11/05 11:46:21 1.44 +++ parser3/src/classes/mail.C 2001/12/25 09:00:28 1.49 @@ -4,7 +4,7 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://paf.design.ru) - $Id: mail.C,v 1.44 2001/11/05 11:46:21 paf Exp $ + $Id: mail.C,v 1.49 2001/12/25 09:00:28 paf Exp $ */ #include "pa_config_includes.h" @@ -17,6 +17,8 @@ #include "pa_request.h" #include "pa_vfile.h" #include "pa_exec.h" +#include "pa_charsets.h" +#include "pa_charset.h" // defines @@ -28,6 +30,10 @@ Methoded *mail_class; +// consts + +const int ATTACHMENT_WEIGHT=100; + // class class MMail : public Methoded { @@ -125,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))) @@ -145,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); @@ -154,31 +156,21 @@ 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; } -static void *find_content_type(const Hash::Key& aattribute, Hash::Val *ameaning, - void *) { - return StrEqNc(aattribute.cstr(), CONTENT_TYPE_NAME)?ameaning:0; -} -static void *find_content_type_charset(const Hash::Key& aattribute, Hash::Val *ameaning, - void *) { - return StrEqNc(aattribute.cstr(), "charset")?ameaning:0; -} - #ifndef DOXYGEN struct Mail_info { - String *attribute_to_exclude; - const char *charset; + Charset *charset; String *header; const String **from, **to; }; @@ -190,7 +182,8 @@ static void add_header_attribute(const H Mail_info& mi=*static_cast(info); // exclude one attribute [body] - if(aattribute==*mi.attribute_to_exclude) + if(aattribute==BODY_NAME + || aattribute==CHARSET_NAME) return; // fetch from & to from header for SMTP @@ -209,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, @@ -250,17 +245,17 @@ static const String& letter_hash_to_stri // prepare header: 'hash' without "body" String& result=*new(pool) String(pool); - const char *charset=0; - if(Value *content_type= - static_cast(letter_hash.first_that(find_content_type))) - if(Hash *hash=content_type->get_hash(&method_name)) - if(Value *content_type_charset= - static_cast(hash->first_that(find_content_type_charset))) - charset=content_type_charset->as_string().cstr(); + Charset *charset; + if(Value *vcharset_name=static_cast(letter_hash.get(*charset_name))) + charset=&charsets->get_charset(vcharset_name->as_string()); + else + charset=&pool.get_source_charset(); - *from=*to=0; + if(from) + *from=0; + if(to) + *to=0; Mail_info mail_info={ - /*excluding*/ body_name, charset, &result, from, to @@ -269,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()); @@ -283,29 +271,55 @@ 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 - body_element->as_string().cstr(); // body + "\n"; // header|body separator + + const String& body=body_element->as_string(); + const void *body_ptr=body.cstr(); // body + size_t body_size=body.size(); // body + const void *mail_ptr; + size_t mail_size; + Charset::transcode(pool, + pool.get_source_charset(), body_ptr, body_size, + *charset/*always set - either mail.charset or $request:charset*/, mail_ptr, mail_size); + result.APPEND_CLEAN((const char*)mail_ptr, mail_size, 0, 0); } } else throw Exception(0, 0, @@ -390,7 +404,7 @@ static void sendmail(Request& r, const S 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); + prog_string->split(argv, &pos_after, " ", 1, String::UL_AS_IS); } // skip unavailable default programs