--- parser3/src/classes/mail.C 2003/02/14 17:28:18 1.88.2.7 +++ parser3/src/classes/mail.C 2003/07/24 11:31:20 1.89 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_MAIL_C="$Date: 2003/02/14 17:28:18 $"; +static const char* IDENT_MAIL_C="$Date: 2003/07/24 11:31:20 $"; #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 @@ -32,7 +34,7 @@ const int ATTACHMENT_WEIGHT=100; // class -class MMail : public Methoded { +class MMail: public Methoded { public: // Methoded bool used_directly() { return false; } void configure_user(Request& r); @@ -43,7 +45,7 @@ public: // global variable -MethodedPtr mail_base_class(new MMail); +DECLARE_CLASS_VAR(mail, 0/*fictive*/, new MMail); // defines for statics @@ -51,98 +53,95 @@ MethodedPtr mail_base_class(new MMail); // statics -static StringPtr mail_name(new String(MAIL_NAME)); +static const String mail_name(MAIL_NAME); +static const String mail_sendmail_name(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& message, + const String* from, const String* to) { + const char* message_cstr=message.cstr(String::L_UNSPECIFIED); + Value* vmail_conf=static_cast(r.classes_conf.get(mail_base_class->name())); - CharPtr 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"; + const char* exception_type="email.format"; if(!from) // we use in sendmail -f {from} && SMTP MAIL from: {from} throw Exception(exception_type, - method_name, + 0, "parameter does not specify 'from' header field"); #ifdef _MSC_VER if(!to) // we use only in SMTP RCPT to: {to} throw Exception(exception_type, - method_name, + 0, "parameter does not specify 'to' header field"); - SMTPPtr smtp(new SMTP(method_name)); - ValuePtr server_port; + SMTP smtp; + Value* 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(); - const char *port=rsplit(server, ':'); + (server_port=vmail_conf->get_hash()->get(StringBody("SMTP")))) { + char* server=server_port->as_string().cstrm(); + const char* port=rsplit(server, ':'); if(!port) port="25"; - smtp->Send(server, port, message_cstr, from->cstr(), to->cstr()); + smtp.Send(server, port, message_cstr, from->cstrm(), to->cstrm()); } else throw Exception("parser.runtime", - method_name, + 0, "$"MAIN_CLASS_NAME":"MAIL_NAME".SMTP not defined"); #else // unix // $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, + 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=static_cast(mail_conf->get(String(pool, sendmailkey_cstr)))) + if(Value* sendmail_value=vmail_conf->get_hash()->get(mail_sendmail_name)) sendmail_command=&sendmail_value->as_string(); else throw Exception("parser.runtime", - method_name, - "$"MAIN_CLASS_NAME":"MAIL_NAME".%s not defined", - sendmailkey_cstr); + 0, + "$"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=new String(PA_FORCED_SENDMAIL); #else - String *test=new(pool) String(pool, "/usr/sbin/sendmail"); + String* test=new String("/usr/sbin/sendmail"); if(!file_executable(*test)) - test=new(pool) String(pool, "/usr/lib/sendmail"); - test->APPEND_CONST(" -t -i -f postmaster"); + test=new String("/usr/lib/sendmail"); + *test<<" -t -i -f postmaster"; sendmail_command=test; #endif } // we know sendmail_command here, should replace "postmaster" with "$from" from message - int at_postmaster=sendmail_command->pos("postmaster"); - if(at_postmaster>0) { + size_t at_postmaster=sendmail_command->pos("postmaster"); + if(at_postmaster!=STRING_NOT_FOUND) { String& reconstructed=sendmail_command->mid(0, at_postmaster); reconstructed << *from; - reconstructed << sendmail_command->mid(at_postmaster+10/*postmaster*/, sendmail_command->size()); + reconstructed << sendmail_command->mid(at_postmaster+10/*postmaster*/, sendmail_command->length()); sendmail_command=&reconstructed; } // execute it - Array argv(pool); - const String *file_spec; - int after_file_spec=sendmail_command->pos(" ", 1); - if(after_file_spec<=0) + ArrayString argv; + 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::UL_AS_IS); + sendmail_command->split(argv, pos_after, " ", String::L_AS_IS); } if(!file_executable(*file_spec)) @@ -152,14 +151,13 @@ static void sendmail(Request& r, StringP #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( // forced_allow #ifdef PA_FORCED_SENDMAIL true @@ -167,38 +165,42 @@ static void sendmail(Request& r, StringP false #endif , *file_spec, - 0/*default env*/, - &argv, - in, out, err); - if(exit_status || err.size()) + 0 /* pass env */, + argv, + in); + if(exec.status || exec.err.length()) throw Exception("email.send", - method_name, + 0, "'%s' reported problem: %s (%d)", file_spec->cstr(), - err.size()?err.cstr():"UNKNOWN", - exit_status); + exec.err.length()?exec.err.cstr():"UNKNOWN", + exec.status); #endif } // methods -static void _send(Request& r, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); - - ValuePtr vhash=params.as_no_junction(0, "message must not be code"); - HashStringValue* hash=vhash->get_hash(method_name); +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", - method_name, + 0, "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; + String* to=0; + const String& message= + GET_SELF(r, VMail).message_hash_to_string(r, hash, 0, from, +#ifdef WIN32 + true +#else + false +#endif + , to); //r.write_pass_lang(message); - sendmail(r, method_name, message, from, to); + sendmail(r, message, from, to); } // constructor & configurator @@ -209,15 +211,14 @@ 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)) - if(mail_element->get_hash(Exception::undefined_source)) + if(Value* mail_element=r.main_class.get_element(mail_name, r.main_class, false)) + if(mail_element->get_hash()) r.classes_conf.put(name(), mail_element); else if( !mail_element->is_string() ) throw Exception("parser.runtime", - Exception::undefined_source, + 0, "$" MAIL_CLASS_NAME ":" MAIL_NAME " is not hash"); }