--- parser3/src/classes/mail.C 2003/02/21 08:50:01 1.88.2.11 +++ parser3/src/classes/mail.C 2003/03/18 16:00:06 1.88.2.16.2.2 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_MAIL_C="$Date: 2003/02/21 08:50:01 $"; +static const char* IDENT_MAIL_C="$Date: 2003/03/18 16:00:06 $"; #include "pa_config_includes.h" #include "pa_vmethod_frame.h" @@ -17,6 +17,7 @@ static const char* IDENT_MAIL_C="$Date: #include "pa_charsets.h" #include "pa_charset.h" #include "pa_uue.h" +#include "pa_vmail.h" #ifdef _MSC_VER # include "smtp/smtp.h" @@ -25,6 +26,7 @@ static const char* IDENT_MAIL_C="$Date: // defines #define MAIL_CLASS_NAME "mail" +#define MAIL_SENDMAIL_NAME "sendmail" // consts @@ -43,8 +45,7 @@ public: // global variable -MethodedPtr mail_class(0); -MethodedPtr mail_base_class(new MMail); +DECLARE_CLASS_VAR(mail, 0/*fictive*/, new MMail); // defines for statics @@ -52,16 +53,16 @@ MethodedPtr mail_base_class(new MMail); // statics -static StringPtr mail_name(new String(MAIL_NAME)); +static const String& mail_name(new String(MAIL_NAME)); +static const String& mail_sendmail_name(new String(MAIL_SENDMAIL_NAME)); // helpers -static void sendmail(Request& r, StringPtr method_name, - StringPtr message, - StringPtr from, StringPtr to) { - Pool& pool=r.pool(); +static void sendmail(Request& r, const String& method_name, + const String& message, + const String& from, const String& to) { - CharPtr message_cstr=message->cstr(String::UL_UNSPECIFIED); + const char* message_cstr=message->cstr(String::UL_UNSPECIFIED); Value* vmail_conf=static_cast(r.classes_conf.get(mail_base_class->name()).get()); const char *exception_type="email.format"; @@ -80,8 +81,8 @@ static void sendmail(Request& r, StringP ValuePtr server_port; // $MAIN:MAIL.SMTP[mail.yourdomain.ru[:port]] if(vmail_conf && - (server_port=vmail_conf->get_hash(method_name)->get(StringPtr(new String("SMTP"))))) { - CharPtr server=server_port->as_string(&pool)->cstr(); + (server_port=vmail_conf->get_hash(method_name)->get(String* (new String("SMTP"))))) { + const char* server=server_port->as_string(&pool)->cstr(); const char *port=rsplit(server, ':'); if(!port) port="25"; @@ -96,30 +97,28 @@ static void sendmail(Request& r, StringP // $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; - const char *sendmailkey_cstr="sendmail"; - if(mail_conf) { + const String& sendmail_command; + if(vmail_conf) { #ifdef PA_FORCED_SENDMAIL throw Exception("parser.runtime", method_name, "Parser was configured with --with-sendmail="PA_FORCED_SENDMAIL " key, to change sendmail you should reconfigure and recompie it"); #else - if(Value *sendmail_value=static_cast(mail_conf->get(String(pool, sendmailkey_cstr)))) - sendmail_command=&sendmail_value->as_string(); + if(ValuePtr sendmail_value=vmail_conf->get_hash(method_name)->get(mail_sendmail_name)) + sendmail_command=sendmail_value->as_string(&pool); else throw Exception("parser.runtime", method_name, - "$"MAIN_CLASS_NAME":"MAIL_NAME".%s not defined", - sendmailkey_cstr); + "$"MAIN_CLASS_NAME":"MAIL_NAME"."MAIL_SENDMAIL_NAME" not defined"); #endif } else { #ifdef PA_FORCED_SENDMAIL - sendmail_command=new(pool) String(pool, PA_FORCED_SENDMAIL); + sendmail_command=String* (new String(PA_FORCED_SENDMAIL)); #else - String *test=new(pool) String(pool, "/usr/sbin/sendmail"); - if(!file_executable(*test)) - test=new(pool) String(pool, "/usr/lib/sendmail"); + const String& test(new String("/usr/sbin/sendmail")); + if(!file_executable(test)) + test=String* (new String("/usr/lib/sendmail")); test->APPEND_CONST(" -t -i -f postmaster"); sendmail_command=test; #endif @@ -128,63 +127,61 @@ static void sendmail(Request& r, StringP // we know sendmail_command here, should replace "postmaster" with "$from" from message int at_postmaster=sendmail_command->pos("postmaster"); if(at_postmaster>0) { - String& reconstructed=sendmail_command->mid(0, at_postmaster); - reconstructed << *from; - reconstructed << sendmail_command->mid(at_postmaster+10/*postmaster*/, sendmail_command->size()); - sendmail_command=&reconstructed; + const String& reconstructed=sendmail_command->mid(0, at_postmaster); + *reconstructed << *from; + *reconstructed << sendmail_command->mid(at_postmaster+10/*postmaster*/, sendmail_command->size()); + sendmail_command=reconstructed; } // execute it - Array argv(pool); - const String *file_spec; + ArrayString argv; + const String& file_spec; int after_file_spec=sendmail_command->pos(" ", 1); if(after_file_spec<=0) file_spec=sendmail_command; else { size_t pos_after=after_file_spec; - file_spec=&sendmail_command->mid(0, pos_after++); + file_spec=sendmail_command->mid(0, pos_after++); sendmail_command->split(argv, &pos_after, " ", 1, String::UL_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".%s to appropriate sendmail command", - sendmailkey_cstr + " Set $"MAIN_CLASS_NAME":"MAIL_NAME"."MAIL_SENDMAIL_NAME" to appropriate sendmail command" #endif ); - String in(pool, message_cstr); String out(pool); String err(pool); - int exit_status=pa_exec( + String in(message_cstr); String out; String err; + PA_exec_result exec=pa_exec(pool, // forced_allow #ifdef PA_FORCED_SENDMAIL true #else false #endif - , *file_spec, - 0/*default env*/, - &argv, - in, out, err); - if(exit_status || err.size()) + , file_spec, + 0 /* pass env */, + argv, + in); + if(exec.status || exec.err->size()) throw Exception("email.send", method_name, "'%s' reported problem: %s (%d)", file_spec->cstr().get(), - err.size()?err.cstr().get():"UNKNOWN", - exit_status); + exec.err->size()?exec.err->cstr().get():"UNKNOWN", + exec.status); #endif } // methods -static void _send(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +static void _send(Request& r, const String& method_name, MethodParams* params) { ValuePtr vhash=params->as_no_junction(0, "message must not be code"); HashStringValue* hash=vhash->get_hash(method_name); @@ -193,10 +190,16 @@ static void _send(Request& r, StringPtr method_name, "message must be hash"); - StringPtr from(0); - StringPtr to(0); - StringPtr message= - GET_SELF(r, VMail).message_hash_to_string(r, method_name, hash, 0, from, to); + const String& from(0); + const String& to(0); + const String& message= + GET_SELF(r, VMail).message_hash_to_string(r, method_name, hash, 0, from, +#ifdef WIN32 + true +#else + false +#endif + , to); //r.write_pass_lang(message); sendmail(r, method_name, message, from, to); @@ -210,7 +213,6 @@ MMail::MMail(): Methoded(MAIL_CLASS_NAME } void MMail::configure_user(Request& r) { - Pool& pool=r.pool(); // $MAIN:MAIL[$SMTP[mail.design.ru]] if(ValuePtr mail_element=r.main_class->get_element(mail_name, *r.main_class, false))