1 files changed, 67 insertions, 41 deletions

diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
index 7671133..e8db9ca 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
@@ -9,28 +9,27 @@
 #include <qmessagebox.h>
 
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <libetpan/libetpan.h>
 
 #include "smtpwrapper.h"
 #include "mailwrapper.h"
 #include "abstractmail.h"
 #include "logindialog.h"
 #include "mailtypes.h"
-//#include "defines.h"
 #include "sendmailprogress.h"
 
-const char* SMTPwrapper::USER_AGENT="OpieMail v0.3";
+const char* SMTPwrapper::USER_AGENT="OpieMail v0.4";
 
 progressMailSend*SMTPwrapper::sendProgress = 0;
 
 SMTPwrapper::SMTPwrapper( Settings *s )
 : QObject() {
     settings = s;
     Config cfg( "mail" );
     cfg.setGroup( "Status" );
     m_queuedMail =  cfg.readNumEntry( "outgoing", 0 );
     emit queuedMails( m_queuedMail );
     connect( this, SIGNAL( queuedMails( int ) ), this, SLOT( emitQCop( int ) )  );
 }
@@ -563,117 +562,117 @@ void SMTPwrapper::storeFailedMail(const char*data,unsigned int size, const char*
     if (failuremessage) {
         QMessageBox::critical(0,tr("Error sending mail"),
             tr("<center>%1</center>").arg(failuremessage));
     }
 }
 
 int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size, SMTPaccount *smtp ) {
     const char *server, *user, *pass;
     bool ssl;
     uint16_t port;
     mailsmtp *session;
     int err,result;
+    QString failuretext = "";
 
     result = 1;
     server = user = pass = 0;
     server = smtp->getServer().latin1();
 
     // FIXME: currently only TLS and Plain work.
 
     ssl = false;
 
     if  ( smtp->ConnectionType() == 2 ) {
         ssl = true;
     }
 
     port = smtp->getPort().toUInt();
 
     session = mailsmtp_new( 20, &progress );
-    if ( session == NULL )
-        goto free_mem;
+    if ( session == NULL ) {
+        /* no failure message cause this happens when problems with memory - than we
+           we can not display any messagebox */
+        return 0;
+    }
 
     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 ) {
         qDebug("Error init connection");
-        storeFailedMail(data,size,mailsmtpError(err));
+        failuretext = tr("Error init SMTP connection: %1").arg(mailsmtpError(err));
         result = 0;
-        goto free_mem_session;
     }
 
-    err = mailsmtp_init( session );
-    if ( err != MAILSMTP_NO_ERROR ) {
-        storeFailedMail(data,size,mailsmtpError(err));
-        result = 0;
-        goto free_con_session;
+    if (result) {
+        err = mailsmtp_init( session );
+        if (err != MAILSMTP_NO_ERROR) {
+            result = 0;
+            failuretext = tr("Error init SMTP connection: %1").arg(mailsmtpError(err));
+        }
     }
 
-    qDebug( "INIT OK" );
-
-    if ( smtp->getLogin() ) {
+    if (result==1 && smtp->getLogin() ) {
         qDebug("smtp with auth");
         if ( smtp->getUser().isEmpty() || smtp->getPassword().isEmpty() ) {
             // get'em
             LoginDialog login( smtp->getUser(), smtp->getPassword(), NULL, 0, true );
             login.show();
             if ( QDialog::Accepted == login.exec() ) {
                 // ok
                 user = login.getUser().latin1();
                 pass = login.getPassword().latin1();
             } else {
                 result = 0;
-                goto free_con_session;
+                failuretext=tr("Login aborted - storing mail to localfolder");
             }
         } else {
             user = smtp->getUser().latin1();
             pass = smtp->getPassword().latin1();
         }
         qDebug( "session->auth: %i", session->auth);
-        err = mailsmtp_auth( session, (char*)user, (char*)pass );
-        if ( err == MAILSMTP_NO_ERROR ) {
-            qDebug("auth ok");
-        } else {
-            storeFailedMail(data,size,tr("Authentification failed"));
-            result = 0;
-            goto free_con_session;
+        if (result) {
+            err = mailsmtp_auth( session, (char*)user, (char*)pass );
+            if ( err == MAILSMTP_NO_ERROR ) {
+                qDebug("auth ok");
+            } else {
+                failuretext = tr("Authentification failed");
+                result = 0;
+            }
         }
-        qDebug( "Done auth!" );
-    } else {
-        qDebug("SMTP without auth");
-        result = 0;
-        goto free_con_session;
     }
 
-    err = mailsmtp_send( session, from, rcpts, data, size );
-    if ( err != MAILSMTP_NO_ERROR ) {
-        storeFailedMail(data,size,mailsmtpError(err));
-        qDebug("Error sending mail: %s",mailsmtpError(err).latin1());
-        result = 0;
-        goto free_con_session;
+    if (result) {
+        err = mailsmtp_send( session, from, rcpts, data, size );
+        if ( err != MAILSMTP_NO_ERROR ) {
+            failuretext=tr("Error sending mail: %1").arg(mailsmtpError(err));
+            result = 0;
+        }
     }
 
-    qDebug( "Mail sent." );
-    storeMail(data,size,"Sent");
-
-free_con_session:
-    mailsmtp_quit( session );
-free_mem_session:
-    mailsmtp_free( session );
-free_mem:
+    if (!result) {
+        storeFailedMail(data,size,failuretext);
+    } else {
+        qDebug( "Mail sent." );
+        storeMail(data,size,"Sent");
+    }
+    if (session) {
+        mailsmtp_quit( session );
+        mailsmtp_free( session );
+    }
     return result;
 }
 
 void SMTPwrapper::sendMail(const Mail&mail,SMTPaccount*aSmtp,bool later ) {
     mailmime * mimeMail;
 
     SMTPaccount *smtp = aSmtp;
 
     if (!later && !smtp) {
         qDebug("Didn't get any send method - giving up");
         return;
     }
@@ -732,54 +731,81 @@ int SMTPwrapper::sendQueuedMail(AbstractMail*wrap,SMTPaccount*smtp,RecMail*which
         smtp_address_list_free( rcpts );
     }
     return res;
 }
 
 /* this is a special fun */
 bool SMTPwrapper::flushOutbox(SMTPaccount*smtp) {
     bool returnValue = true;
 
     if (!smtp)
         return false;
 
+    bool reset_user_value = false;
     QString localfolders = AbstractMail::defaultLocalfolder();
     AbstractMail*wrap = AbstractMail::getWrapper(localfolders);
     if (!wrap) {
         qDebug("memory error");
         return false;
     }
+    QString oldPw, oldUser;
     QList<RecMail> mailsToSend;
     QList<RecMail> mailsToRemove;
     QString mbox("Outgoing");
     wrap->listMessages(mbox,mailsToSend);
     if (mailsToSend.count()==0) {
         delete wrap;
         return false;
     }
+    
+    oldPw = smtp->getPassword();
+    oldUser = smtp->getUser();
+    if (smtp->getLogin() && (smtp->getUser().isEmpty() || smtp->getPassword().isEmpty()) ) {
+        // get'em
+        QString user,pass;
+        LoginDialog login( smtp->getUser(), smtp->getPassword(), NULL, 0, true );
+        login.show();
+        if ( QDialog::Accepted == login.exec() ) {
+            // ok
+            user = login.getUser().latin1();
+            pass = login.getPassword().latin1();
+            reset_user_value = true;
+            smtp->setUser(user);
+            smtp->setPassword(pass);
+        } else {
+            return true;
+        }
+    }
+
+    
     mailsToSend.setAutoDelete(false);
     sendProgress = new progressMailSend();
     sendProgress->show();
     sendProgress->setMaxMails(mailsToSend.count());
 
     while (mailsToSend.count()>0) {
         if (sendQueuedMail(wrap,smtp,mailsToSend.at(0))==0) {
             QMessageBox::critical(0,tr("Error sending mail"),
                                   tr("Error sending queued mail - breaking"));
             returnValue = false;
             break;
         }
         mailsToRemove.append(mailsToSend.at(0));
         mailsToSend.removeFirst();
         sendProgress->setCurrentMails(mailsToRemove.count());
     }
+    if (reset_user_value) {
+        smtp->setUser(oldUser);
+        smtp->setPassword(oldPw);
+    }
     Config cfg( "mail" );
     cfg.setGroup( "Status" );
     m_queuedMail = 0;
     cfg.writeEntry( "outgoing", m_queuedMail );
     emit queuedMails( m_queuedMail );
     sendProgress->hide();
     delete sendProgress;
     sendProgress = 0;
     wrap->deleteMails(mbox,mailsToRemove);
     mailsToSend.setAutoDelete(true);
     delete wrap;
     return returnValue;