--- parser3/src/classes/mail.C 2003/03/24 17:12:33 1.88.2.16.2.13 +++ parser3/src/classes/mail.C 2003/11/20 17:07:44 1.95 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_MAIL_C="$Date: 2003/03/24 17:12:33 $"; +static const char * const IDENT_MAIL_C="$Date: 2003/11/20 17:07:44 $"; #include "pa_config_includes.h" #include "pa_vmethod_frame.h" @@ -26,7 +26,7 @@ static const char* IDENT_MAIL_C="$Date: // defines #define MAIL_CLASS_NAME "mail" -#define MAIL_SENDMAIL_NAME "sendmail" +#define SENDMAIL_NAME "sendmail" // consts @@ -54,13 +54,22 @@ DECLARE_CLASS_VAR(mail, 0/*fictive*/, ne // statics static const String mail_name(MAIL_NAME); -static const String mail_sendmail_name(MAIL_SENDMAIL_NAME); +static const String mail_sendmail_name(SENDMAIL_NAME); // helpers static void sendmail(Request& r, const String& message, - const String* from, const String* to) { + const String* from, const String* +#ifdef _MSC_VER + to +#endif + , + const String* +#ifndef _MSC_VER + options +#endif + ) { const char* message_cstr=message.cstr(String::L_UNSPECIFIED); Value* vmail_conf=static_cast(r.classes_conf.get(mail_base_class->name())); @@ -80,7 +89,7 @@ static void sendmail(Request& r, Value* server_port; // $MAIN:MAIL.SMTP[mail.yourdomain.ru[:port]] if(vmail_conf && - (server_port=vmail_conf->get_hash()->get(StringBody("SMTP")))) { + (server_port=vmail_conf->get_hash()->get(String::Body("SMTP")))) { char* server=server_port->as_string().cstrm(); const char* port=rsplit(server, ':'); if(!port) @@ -96,98 +105,104 @@ static void sendmail(Request& r, // $MAIN:MAIL.sendmail["/usr/sbin/sendmail -t -i -f postmaster"] default // $MAIN:MAIL.sendmail["/usr/lib/sendmail -t -i -f postmaster"] default - const String& sendmail_command; + String* sendmail_command=new String; if(vmail_conf) { #ifdef PA_FORCED_SENDMAIL throw Exception("parser.runtime", - method_name, + 0, "Parser was configured with --with-sendmail="PA_FORCED_SENDMAIL " key, to change sendmail you should reconfigure and recompie it"); #else if(Value* sendmail_value=vmail_conf->get_hash()->get(mail_sendmail_name)) - sendmail_command=sendmail_value->as_string(); + *sendmail_command<as_string(); else throw Exception("parser.runtime", - method_name, - "$"MAIN_CLASS_NAME":"MAIL_NAME"."MAIL_SENDMAIL_NAME" not defined"); + 0, + "$"MAIN_CLASS_NAME":"MAIL_NAME"."SENDMAIL_NAME" not defined"); #endif } else { #ifdef PA_FORCED_SENDMAIL - sendmail_command=String* (new String(PA_FORCED_SENDMAIL)); + sendmail_command<APPEND_CONST(" -t -i -f postmaster"); - sendmail_command=test; + String* test=new String("/usr/sbin/sendmail"); + if(!file_executable(*test)) + test=new String("/usr/lib/sendmail"); + *sendmail_command<<*test; + *sendmail_command<<" -t -i -f postmaster"; #endif } + if(options) + *sendmail_command<<" "<<*options; // we know sendmail_command here, should replace "postmaster" with "$from" from message size_t at_postmaster=sendmail_command->pos("postmaster"); if(at_postmaster!=STRING_NOT_FOUND) { - const String& reconstructed=sendmail_command->mid(0, at_postmaster); - *reconstructed << *from; - *reconstructed << sendmail_command->mid(at_postmaster+10/*postmaster*/, sendmail_command->length()); - sendmail_command=reconstructed; + String& reconstructed=sendmail_command->mid(0, at_postmaster); + reconstructed << *from; + reconstructed << sendmail_command->mid(at_postmaster+10/*postmaster*/, sendmail_command->length()); + sendmail_command=&reconstructed; } // execute it ArrayString argv; - const String& file_spec; + const String* file_spec; size_t after_file_spec=sendmail_command->pos(' '); if(after_file_spec==STRING_NOT_FOUND || 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::L_AS_IS); + file_spec=&sendmail_command->mid(0, pos_after++); + sendmail_command->split(argv, pos_after, " ", String::L_AS_IS); } - if(!file_executable(file_spec)) + if(!file_executable(*file_spec)) throw Exception("email.send", file_spec, "is not executable." #ifdef PA_FORCED_SENDMAIL " Use configure key \"--with-sendmail=appropriate sendmail command\"" #else - " Set $"MAIN_CLASS_NAME":"MAIL_NAME"."MAIL_SENDMAIL_NAME" to appropriate sendmail command" + " Set $"MAIN_CLASS_NAME":"MAIL_NAME"."SENDMAIL_NAME" to appropriate sendmail command" #endif ); - String in(message_cstr); String out; String err; - PA_exec_result exec=pa_exec(pool, + String in(message_cstr); + PA_exec_result exec=pa_exec( // forced_allow #ifdef PA_FORCED_SENDMAIL true #else false #endif - , file_spec, + , *file_spec, 0 /* pass env */, argv, in); - if(exec.status || exec.err->length()) + if(exec.status || exec.err.length()) throw Exception("email.send", - method_name, + 0, "'%s' reported problem: %s (%d)", - file_spec->cstr().get(), - exec.err->length()?exec.err->cstr().get():"UNKNOWN", + file_spec->cstr(), + exec.err.length()?exec.err.cstr():"UNKNOWN", exec.status); #endif } // methods -static void _send(Request& r, MethodParams* params) { - Value& vhash=params->as_no_junction(0, "message must not be code"); +static void _send(Request& r, MethodParams& params) { + Value& vhash=params.as_no_junction(0, "message must not be code"); HashStringValue* hash=vhash.get_hash(); if(!hash) throw Exception("parser.runtime", 0, "message must be hash"); + const String* soptions=0; + if(Value* voptions=hash->get(MAIL_OPTIONS_NAME)) + soptions=&voptions->as_string(); + const String* from=0; String* to=0; const String& message= @@ -200,7 +215,7 @@ static void _send(Request& r, MethodPara , to); //r.write_pass_lang(message); - sendmail(r, message, from, to); + sendmail(r, message, from, to, soptions); } // constructor & configurator