1 files changed, 51 insertions, 10 deletions

diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
index 162b1b9..a6a46ba 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
@@ -1,28 +1,31 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <qdir.h>
 
-#include <libetpan/mailmime.h>
+#include <libetpan/libetpan.h>
+#if 0
 #include <libetpan/mailimf.h>
 #include <libetpan/mailsmtp.h>
 #include <libetpan/mailstorage.h>
 #include <libetpan/maildriver.h>
+#endif
 
 #include "smtpwrapper.h"
 #include "mailwrapper.h"
+#include "mboxwrapper.h"
 #include "logindialog.h"
 #include "defines.h"
 
 SMTPwrapper::SMTPwrapper( Settings *s )
     : QObject()
 {
     settings = s;
 }
 
 QString SMTPwrapper::mailsmtpError( int errnum )
 {
     switch ( errnum ) {
@@ -456,24 +459,41 @@ void SMTPwrapper::writeToFile(const QString&file, mailmime *mail )
     err = mailmime_write( f, &col, mail );
     if ( err != MAILIMF_NO_ERROR ) {
         fclose( f );
         qDebug( "writeToFile: error writing mailmime" );
         return;
     }
 
     fclose( f );
 }
 
 void SMTPwrapper::readFromFile(const QString&file, char **data, size_t *size )
 {
+
+    QFile msg_cache(file);
+    QString msg = "";
+    msg_cache.open(IO_ReadOnly);
+    char*message = new char[4096];
+    memset(message,0,4096);
+    while (msg_cache.readBlock(message,4095)>0) {
+         msg+=message;
+         memset(message,0,4096);
+    }
+    delete message;
+    *data = (char*)malloc(msg.length()+1*sizeof(char));
+    memset(*data,0,msg.length()+1);
+    memcpy(*data,msg.ascii(),msg.length());
+    *size=msg.length();
+
+#if 0
     char *buf;
     struct stat st;
     int fd, count = 0, total = 0;
 
     fd = open( file.latin1(), O_RDONLY, 0 );
     if ( fd == -1 ) return;
 
     if ( fstat( fd, &st ) != 0 ) goto err_close;
     if ( !st.st_size )  goto err_close;
 
     buf = (char *) malloc( st.st_size );
     if ( !buf ) goto err_close;
@@ -486,59 +506,79 @@ void SMTPwrapper::readFromFile(const QString&file, char **data, size_t *size )
 
     *data = buf;
     *size = st.st_size;
 
     close( fd );
 
     return;             // Success :)
 
 err_free:
     free( buf );
 err_close:
     close( fd );
+#endif
 }
 
 void SMTPwrapper::progress( size_t current, size_t maximum )
 {
     qDebug( "Current: %i of %i", current, maximum );
 }
 
-void SMTPwrapper::smtpSend( mailmime *mail )
+void SMTPwrapper::storeMail(char*mail, size_t length, const QString&box)
+{
+    if (!mail) return;
+    QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
+    MBOXwrapper*wrap = new MBOXwrapper(localfolders);
+    wrap->storeMessage(mail,length,box);
+    delete wrap;
+}
+
+void SMTPwrapper::smtpSend( mailmime *mail,bool later )
 {
     mailsmtp *session;
     clist *rcpts;
     char *from, *data, *server, *user = NULL, *pass = NULL;
     size_t size;
     int err;
     bool ssl;
     uint16_t port;
 
 
     from = getFrom( mail );
     SMTPaccount *smtp = getAccount( from );
     if ( smtp == NULL ) {
         free(from);
         return;
     }
-    server = strdup( smtp->getServer().latin1() );
-    ssl = smtp->getSSL();
-    port = smtp->getPort().toUInt();
     rcpts = createRcptList( mail->mm_data.mm_message.mm_fields );
 
     QString file = getTmpFile();
     writeToFile( file, mail );
+    
     readFromFile( file, &data, &size );
     QFile f( file );
     f.remove();
+    
+    storeMail(data,size,(later?"Outgoing":"Sent"));
 
+    if (later) {
+        smtp_address_list_free( rcpts );
+        if (data) free( data );
+        if (from) free(from);
+        return;
+    }
+    server = strdup( smtp->getServer().latin1() );
+    ssl = smtp->getSSL();
+    port = smtp->getPort().toUInt();
+    
     session = mailsmtp_new( 20, &progress );
     if ( session == NULL ) goto free_mem;
 
     qDebug( "Servername %s at port %i", server, port );
     if ( ssl ) {
         qDebug( "SSL session" );
         err = mailsmtp_ssl_connect( session, server, port );
     } else {
         qDebug( "No SSL session" );
         err = mailsmtp_socket_connect( session, server, port );
     }
     if ( err != MAILSMTP_NO_ERROR ) goto free_mem_session;
@@ -572,33 +612,34 @@ void SMTPwrapper::smtpSend( mailmime *mail )
 
     err = mailsmtp_send( session, from, rcpts, data, size );
     if ( err != MAILSMTP_NO_ERROR ) goto free_con_session;
 
     qDebug( "Mail sent." );
 
 free_con_session:
     mailsmtp_quit( session );
 free_mem_session:
     mailsmtp_free( session );
 free_mem:
     smtp_address_list_free( rcpts );
-    free( data );
-    free( server );
+    if (data) free( data );
+    if (from) free(from);
+    if (server) free( server );
     if ( smtp->getLogin() ) {
         free( user );
         free( pass );
     }
     free( from );
 }
 
-void SMTPwrapper::sendMail(const Mail&mail )
+void SMTPwrapper::sendMail(const Mail&mail,bool later )
 {
-    mailmime *mimeMail;
+    mailmime * mimeMail;
 
     mimeMail = createMimeMail(mail );
     if ( mimeMail == NULL ) {
         qDebug( "sendMail: error creating mime mail" );
     } else {
-        smtpSend( mimeMail );
+        smtpSend( mimeMail,later );
         mailmime_free( mimeMail );
     }
 }