--- parser3/src/classes/mail.C 2003/03/20 14:19:08 1.88.2.16.2.5 +++ parser3/src/classes/mail.C 2003/03/24 17:00:49 1.88.2.16.2.12 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_MAIL_C="$Date: 2003/03/20 14:19:08 $"; +static const char* IDENT_MAIL_C="$Date: 2003/03/24 17:00:49 $"; #include "pa_config_includes.h" #include "pa_vmethod_frame.h" @@ -53,44 +53,43 @@ DECLARE_CLASS_VAR(mail, 0/*fictive*/, ne // statics -static const String& mail_name(new String(MAIL_NAME)); -static const String& mail_sendmail_name(new String(MAIL_SENDMAIL_NAME)); +static const String mail_name(MAIL_NAME); +static const String mail_sendmail_name(MAIL_SENDMAIL_NAME); // helpers -static void sendmail(Request& r, const String& method_name, - const String& message, - const String& from, const String& to) { - - const char* message_cstr=message->cstr(String::UL_UNSPECIFIED); - Value* vmail_conf=static_cast(r.classes_conf.get(mail_base_class->name()).get()); +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())); 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(String* (new String("SMTP"))))) { - const char* server=server_port->as_string(&pool)->cstr(); + (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 @@ -105,8 +104,8 @@ static void sendmail(Request& r, const S "Parser was configured with --with-sendmail="PA_FORCED_SENDMAIL " key, to change sendmail you should reconfigure and recompie it"); #else - if(ValuePtr sendmail_value=vmail_conf->get_hash(method_name)->get(mail_sendmail_name)) - sendmail_command=sendmail_value->as_string(&pool); + 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, @@ -125,8 +124,8 @@ static void sendmail(Request& r, const S } // 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) { const String& reconstructed=sendmail_command->mid(0, at_postmaster); *reconstructed << *from; *reconstructed << sendmail_command->mid(at_postmaster+10/*postmaster*/, sendmail_command->length()); @@ -136,13 +135,13 @@ static void sendmail(Request& r, const S // execute it ArrayString argv; const String& file_spec; - int after_file_spec=sendmail_command->pos(" ", 1); - if(after_file_spec<=0) + size_t after_file_spec=sendmail_command->pos(" ", 1); + 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, " ", 1, String::L_AS_IS); } if(!file_executable(file_spec)) @@ -181,19 +180,18 @@ static void sendmail(Request& r, const S // methods -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); +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"); - const String& from(0); - const String& to(0); + const String* from=0; + String* to=0; const String& message= - GET_SELF(r, VMail).message_hash_to_string(r, method_name, hash, 0, from, + GET_SELF(r, VMail).message_hash_to_string(r, hash, 0, from, #ifdef WIN32 true #else @@ -202,7 +200,7 @@ static void _send(Request& r, const Stri , to); //r.write_pass_lang(message); - sendmail(r, method_name, message, from, to); + sendmail(r, message, from, to); } // constructor & configurator @@ -215,8 +213,8 @@ MMail::MMail(): Methoded(MAIL_CLASS_NAME void MMail::configure_user(Request& r) { // $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(0)) + 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() )