--- parser3/src/classes/mail.C 2001/04/08 13:11:15 1.10 +++ parser3/src/classes/mail.C 2001/04/10 07:47:38 1.15 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: mail.C,v 1.10 2001/04/08 13:11:15 paf Exp $ + $Id: mail.C,v 1.15 2001/04/10 07:47:38 paf Exp $ */ #include "pa_config_includes.h" @@ -18,6 +18,7 @@ #include "pa_common.h" #include "pa_request.h" #include "pa_vfile.h" +#include "pa_exec.h" // global var @@ -217,6 +218,7 @@ static const String& letter_hash_to_stri // prepare header: 'hash' without "body" String& result=*new(pool) String(pool); + *from=*to=0; Mail_info mail_info={ /*excluding*/ body_name, &result, @@ -272,23 +274,23 @@ static const String& letter_hash_to_stri return result; } -/// @test unix ver static void sendmail(Request& r, const String& method_name, const String& letter, const String *from, const String *to) { Pool& pool=r.pool(); + char *letter_cstr=letter.cstr(); + #ifdef WIN32 if(!from) PTHROW(0, 0, &method_name, - "not specified 'from'"); + "has no 'from' header specified"); if(!to) PTHROW(0, 0, &method_name, - "not specified 'to'"); + "has no 'to' header specified"); - char *letter_cstr=letter.cstr(); SMTP& smtp=*new(pool) SMTP(pool, method_name); Value *server_port; // $MAIN:MAIL.SMTP[mail.design.ru] @@ -296,19 +298,77 @@ static void sendmail(Request& r, const S (server_port=static_cast(r.mail->get( *new(pool) String(pool, "SMTP"))))) { char *server=server_port->as_string().cstr(); - char *port=rsplit(server, ':'); + const char *port=rsplit(server, ':'); if(!port) - port=const_cast("25"); + port="25"; smtp.Send(server, port, letter_cstr, from->cstr(), to->cstr()); } else PTHROW(0, 0, &method_name, - "$MAIN:MAIL.SMTP not defined"); + "$"MAIN_CLASS_NAME":"MAIL_NAME".SMTP not defined"); #else - PTHROW(0, 0, - &method_name, - "todo"); + // unix + // $MAIN:MAIL.prog1["/usr/sbin/sendmail -t"] default + // $MAIN:MAIL.prog2["/usr/lib/sendmail -t"] default + if(r.mail) { + 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(Value *prog_value=static_cast(r.mail->get(prog_key))) + prog_string=&prog_value->as_string(); + else + if(no==0) + continue; + else + PTHROW(0, 0, + &method_name, + "$"MAIN_CLASS_NAME":"MAIL_NAME".%s not defined", + prog_key.cstr()); + } + } + // 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); + } + + // 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()) + PTHROW(0, 0, + &method_name, + "'%s' reported problem: %s (%d)", + file_spec->cstr(), + err.size()?err.cstr():"UNKNOWN", + exit_status); + break; + } + } else + PTHROW(0, 0, + &method_name, + "$"MAIN_CLASS_NAME":"MAIL_NAME" not defined"); #endif }