--- parser3/src/classes/mail.C 2001/04/15 13:12:17 1.18 +++ parser3/src/classes/mail.C 2001/05/04 10:42:36 1.26 @@ -5,24 +5,43 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: mail.C,v 1.18 2001/04/15 13:12:17 paf Exp $ + $Id: mail.C,v 1.26 2001/05/04 10:42:36 paf Exp $ */ #include "pa_config_includes.h" -#ifdef WIN32 +#ifdef _MSC_VER # 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 @@ -96,7 +115,7 @@ static void uuencode(String& result, con } //footer - result.APPEND_CLEAN((const char *)uue_table, 1/* one char */, 0, 0) << "\n" + result.APPEND_AS_IS((const char *)uue_table, 1/* one char */, 0, 0) << "\n" "end\n"; } @@ -146,8 +165,19 @@ static const String& attach_hash_to_stri } +static bool find_content_type(const Hash::Key& aattribute, Hash::Val *ameaning, + void *) { + return StrEqNc(aattribute.cstr(), CONTENT_TYPE_NAME); +} +static bool find_content_type_charset(const Hash::Key& aattribute, Hash::Val *ameaning, + void *) { + return StrEqNc(aattribute.cstr(), "charset"); +} + +/// used by mail: _send / letter_hash_to_string / add_header_attribute struct Mail_info { String *attribute_to_exclude; + const char *charset; String *header; const String **from, **to; }; @@ -170,9 +200,12 @@ static void add_header_attribute(const H // append header line *mi.header << aattribute << ":" << - attributed_meaning_to_string(lmeaning, String::UL_MAIL_HEADER) << + attributed_meaning_to_string(lmeaning, String::UL_MAIL_HEADER). + cstr(String::UL_UNSPECIFIED, 0, mi.charset) << "\n"; } + +/// used in mail: _send / letter_hash_to_string / add_part struct Seq_item { const String *part_name; Value *part_value; @@ -213,9 +246,19 @@ 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(); + *from=*to=0; Mail_info mail_info={ /*excluding*/ body_name, + charset, &result, from, to }; @@ -275,8 +318,9 @@ static void sendmail(Request& r, const S Pool& pool=r.pool(); char *letter_cstr=letter.cstr(); + Hash *mail_conf=static_cast(r.classes_conf.get(mail_class->name())); -#ifdef WIN32 +#ifdef _MSC_VER if(!from) PTHROW(0, 0, &method_name, @@ -289,8 +333,8 @@ 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(r.mail->get( + if(mail_conf && + (server_port=static_cast(mail_conf->get( *new(pool) String(pool, "SMTP"))))) { char *server=server_port->as_string().cstr(); const char *port=rsplit(server, ':'); @@ -306,7 +350,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; @@ -318,7 +362,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(r.mail->get(prog_key))) + if(Value *prog_value=static_cast(mail_conf->get(prog_key))) prog_string=&prog_value->as_string(); else if(no==0) @@ -363,7 +407,7 @@ 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 } @@ -383,12 +427,38 @@ 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); - //r.write_assign_lang(*new(pool) VString(letter)); +// r.write_assign_lang(*new(pool) VString(letter)); 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); }