--- parser3/src/classes/mail.C	2003/11/20 15:35:29	1.93
+++ parser3/src/classes/mail.C	2003/12/11 09:25:50	1.98
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_MAIL_C="$Date: 2003/11/20 15:35:29 $";
+static const char * const IDENT_MAIL_C="$Date: 2003/12/11 09:25:50 $";
 
 #include "pa_config_includes.h"
 #include "pa_vmethod_frame.h"
@@ -20,7 +20,7 @@ static const char* IDENT_MAIL_C="$Date:
 #include "pa_vmail.h"
 
 #ifdef _MSC_VER
-#	include "smtp/smtp.h"
+#	include "smtp.h"
 #endif
 
 // defines
@@ -60,7 +60,11 @@ static const String mail_sendmail_name(S
 
 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
@@ -85,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(String::Body("SMTP")))) {
+		(server_port=vmail_conf->get_hash()->get("SMTP"))) {
 		char* server=server_port->as_string().cstrm();
 		const char* port=rsplit(server, ':');
 		if(!port)
@@ -118,7 +122,7 @@ static void sendmail(Request& r,
 #endif
 	} else {
 #ifdef PA_FORCED_SENDMAIL
-		sendmail_command<<PA_FORCED_SENDMAIL;
+		*sendmail_command<<PA_FORCED_SENDMAIL;
 #else
 		String* test=new String("/usr/sbin/sendmail");
 		if(!file_executable(*test))
@@ -163,7 +167,7 @@ static void sendmail(Request& r,
 		);
 
 
-	String in(message_cstr); String out; String err;
+	String in(message_cstr);
 	PA_exec_result exec=pa_exec(
 		// forced_allow
 #ifdef PA_FORCED_SENDMAIL