[BACK]Return to mail.C CVS log [TXT] [DIR] Up to [parser3project] / parser3 / src / classes

Diff for /parser3/src/classes/mail.C between versions 1.88.2.16.2.13 and 1.94

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

E-mail: