--- parser3/src/classes/mail.C 2001/09/14 15:41:59 1.37 +++ parser3/src/classes/mail.C 2001/12/17 18:44:51 1.45 @@ -2,12 +2,10 @@ Parser: @b mail parser class. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://paf.design.ru) - Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: mail.C,v 1.37 2001/09/14 15:41:59 parser Exp $ + $Id: mail.C,v 1.45 2001/12/17 18:44:51 paf Exp $ */ -static const char *RCSId="$Id: mail.C,v 1.37 2001/09/14 15:41:59 parser Exp $"; #include "pa_config_includes.h" @@ -19,6 +17,8 @@ static const char *RCSId="$Id: mail.C,v #include "pa_request.h" #include "pa_vfile.h" #include "pa_exec.h" +#include "pa_charsets.h" +#include "pa_charset.h" // defines @@ -129,7 +129,7 @@ static const String& attach_hash_to_stri Value *vtype=static_cast(attach_hash.get(*new(pool) String(pool, "type"))); if(!vtype) - PTHROW(0, 0, + throw Exception(0, 0, &origin_string, "has no $type"); @@ -137,7 +137,7 @@ static const String& attach_hash_to_stri if(Value *value=static_cast(attach_hash.get(*value_name))) vfile=value->as_vfile(String::UL_AS_IS); // bad with html attaches. todo: solve else - PTHROW(0, 0, + throw Exception(0, 0, &origin_string, "has no $value"); @@ -160,7 +160,7 @@ static const String& attach_hash_to_stri if(type=="uue") { uuencode(result, file_name_cstr, *vfile); } else - PTHROW(0, 0, + throw Exception(0, 0, &type, "unknown encode type"); @@ -168,19 +168,9 @@ static const String& attach_hash_to_stri } -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; }; @@ -192,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 @@ -252,17 +243,14 @@ 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()) - 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; Mail_info mail_info={ - /*excluding*/ body_name, charset, &result, from, to @@ -270,7 +258,7 @@ static const String& letter_hash_to_stri letter_hash.for_each(add_header_attribute, &mail_info); if(Value *body_element=static_cast(letter_hash.get(*body_name))) { - if(Hash *body_hash=body_element->get_hash()) { + 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 @@ -290,14 +278,14 @@ static const String& letter_hash_to_stri // intermediate boundary result << "\n--" << boundary << "\n"; - if(Hash *part_hash=seq[i].part_value->get_hash()) + 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); else result << letter_hash_to_string(r, method_name, *part_hash, level+1, 0, 0); else - PTHROW(0, 0, + throw Exception(0, 0, seq[i].part_name, "part is not hash"); } @@ -306,11 +294,20 @@ static const String& letter_hash_to_stri result << "\n--" << boundary << "--\n"; } else { result << - "\n" << // header|body separator - body_element->as_string(); // 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 - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "has no $body"); @@ -327,11 +324,11 @@ static void sendmail(Request& r, const S #ifdef _MSC_VER if(!from) - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "has no 'from' header specified"); if(!to) - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "has no 'to' header specified"); @@ -348,7 +345,7 @@ static void sendmail(Request& r, const S smtp.Send(server, port, letter_cstr, from->cstr(), to->cstr()); } else - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "$"MAIN_CLASS_NAME":"MAIL_NAME".SMTP not defined"); #else @@ -373,12 +370,12 @@ static void sendmail(Request& r, const S if(no==0) continue; else - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "$"MAIN_CLASS_NAME":"MAIL_NAME".%s not defined", prog_key.cstr()); } else - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "$" MAIN_CLASS_NAME ":" MAIL_NAME " not defined"); } @@ -405,7 +402,7 @@ static void sendmail(Request& r, const S &argv, in, out, err); if(exit_status || err.size()) - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "'%s' reported problem: %s (%d)", file_spec->cstr(), @@ -423,9 +420,9 @@ static void _send(Request& r, const Stri Pool& pool=r.pool(); Value& vhash=params->as_no_junction(0, "message must not be code"); - Hash *hash=vhash.get_hash(); + Hash *hash=vhash.get_hash(&method_name); if(!hash) - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "message must be hash"); @@ -454,10 +451,10 @@ void MMail::configure_user(Request& r) { // $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()) + if(Hash *mail_conf=mail_element->get_hash(0)) r.classes_conf.put(name(), mail_conf); else - PTHROW(0, 0, + throw Exception(0, 0, 0, "$" MAIL_CLASS_NAME ":" MAIL_NAME " is not hash"); }