ask for user/password if field is empty

4 files changed, 70 insertions, 8 deletions

diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp
index 838300a..cce3d34 100644
--- a/noncore/net/mail/imapwrapper.cpp
+++ b/noncore/net/mail/imapwrapper.cpp
@@ -1,21 +1,22 @@
 
 #include <stdlib.h>
 
 #include "imapwrapper.h"
 #include "mailtypes.h"
+#include "logindialog.h"
 #include <libetpan/mailimap.h>
 
 IMAPwrapper::IMAPwrapper( IMAPaccount *a )
     : AbstractMail()
 {
     account = a;
     m_imap = 0;
 }
 
 IMAPwrapper::~IMAPwrapper()
 {
     logout();
 }
 
 void IMAPwrapper::imap_progress( size_t current, size_t maximum )
 {
@@ -23,34 +24,48 @@ void IMAPwrapper::imap_progress( size_t current, size_t maximum )
 }
 
 void IMAPwrapper::login()
 {
     const char *server, *user, *pass;
     uint16_t port;
     int err = MAILIMAP_NO_ERROR;
 
     /* we are connected this moment */
     /* TODO: setup a timer holding the line or if connection closed - delete the value */
     if (m_imap) {
         mailstream_flush(m_imap->imap_stream);
         return;
     }
     server = account->getServer().latin1();
     port = account->getPort().toUInt();
-    user = account->getUser().latin1();
-    pass = account->getPassword().latin1();
+        if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) {
+          LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true );
+          login.show();
+          if ( QDialog::Accepted == login.exec() ) {
+                // ok
+                user = strdup( login.getUser().latin1() );
+                pass = strdup( login.getPassword().latin1() );
+          } else {
+                // cancel
+                qDebug( "IMAP: Login canceled" );
+                return;
+          }
+        } else {
+          user = account->getUser().latin1();
+          pass = account->getPassword().latin1();
+        }
 
     m_imap = mailimap_new( 20, &imap_progress );
     /* connect */
     if (account->getSSL()) {
         err = mailimap_ssl_connect( m_imap, (char*)server, port );
     } else {
         err = mailimap_socket_connect( m_imap, (char*)server, port );
     }
 
     if ( err != MAILIMAP_NO_ERROR &&
          err != MAILIMAP_NO_ERROR_AUTHENTICATED &&
          err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) {
          qDebug("error connecting server: %s",m_imap->imap_response);
          mailimap_free( m_imap );
          m_imap = 0;
          return;
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index 838300a..cce3d34 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -1,21 +1,22 @@
 
 #include <stdlib.h>
 
 #include "imapwrapper.h"
 #include "mailtypes.h"
+#include "logindialog.h"
 #include <libetpan/mailimap.h>
 
 IMAPwrapper::IMAPwrapper( IMAPaccount *a )
     : AbstractMail()
 {
     account = a;
     m_imap = 0;
 }
 
 IMAPwrapper::~IMAPwrapper()
 {
     logout();
 }
 
 void IMAPwrapper::imap_progress( size_t current, size_t maximum )
 {
@@ -23,34 +24,48 @@ void IMAPwrapper::imap_progress( size_t current, size_t maximum )
 }
 
 void IMAPwrapper::login()
 {
     const char *server, *user, *pass;
     uint16_t port;
     int err = MAILIMAP_NO_ERROR;
 
     /* we are connected this moment */
     /* TODO: setup a timer holding the line or if connection closed - delete the value */
     if (m_imap) {
         mailstream_flush(m_imap->imap_stream);
         return;
     }
     server = account->getServer().latin1();
     port = account->getPort().toUInt();
-    user = account->getUser().latin1();
-    pass = account->getPassword().latin1();
+        if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) {
+          LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true );
+          login.show();
+          if ( QDialog::Accepted == login.exec() ) {
+                // ok
+                user = strdup( login.getUser().latin1() );
+                pass = strdup( login.getPassword().latin1() );
+          } else {
+                // cancel
+                qDebug( "IMAP: Login canceled" );
+                return;
+          }
+        } else {
+          user = account->getUser().latin1();
+          pass = account->getPassword().latin1();
+        }
 
     m_imap = mailimap_new( 20, &imap_progress );
     /* connect */
     if (account->getSSL()) {
         err = mailimap_ssl_connect( m_imap, (char*)server, port );
     } else {
         err = mailimap_socket_connect( m_imap, (char*)server, port );
     }
 
     if ( err != MAILIMAP_NO_ERROR &&
          err != MAILIMAP_NO_ERROR_AUTHENTICATED &&
          err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) {
          qDebug("error connecting server: %s",m_imap->imap_response);
          mailimap_free( m_imap );
          m_imap = 0;
          return;
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index 22a4c70..b0b985c 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -1,19 +1,20 @@
 #include <stdlib.h>
 #include "pop3wrapper.h"
 #include "mailtypes.h"
+#include "logindialog.h"
 #include <libetpan/mailpop3.h>
 #include <libetpan/mailmime.h>
 #include <libetpan/data_message_driver.h>
 #include <qfile.h>
 
 /* we don't fetch messages larger than 5 MB */
 #define HARD_MSG_SIZE_LIMIT 5242880
 
 POP3wrapper::POP3wrapper( POP3account *a )
 {
     account = a;
     m_pop3 = NULL;
     msgTempName = a->getFileName()+"_msg_cache";
     last_msg_id = 0;
 }
 
@@ -344,34 +345,49 @@ QString POP3wrapper::parseMailboxList( mailimf_mailbox_list *list )
     }
     
     return result;
 }
 
 void POP3wrapper::login()
 {
     /* we'll hold the line */
     if ( m_pop3 != NULL ) return;
 
     const char *server, *user, *pass;
     uint16_t port;
     int err = MAILPOP3_NO_ERROR;
 
     server = account->getServer().latin1();
     port = account->getPort().toUInt();
-    user = account->getUser().latin1();
-    pass = account->getPassword().latin1();
+
+        if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) {
+          LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true );
+          login.show();
+          if ( QDialog::Accepted == login.exec() ) {
+                // ok
+                user = strdup( login.getUser().latin1() );
+                pass = strdup( login.getPassword().latin1() );
+          } else {
+                // cancel
+                qDebug( "POP3: Login canceled" );
+                return;
+          }
+        } else {
+          user = account->getUser().latin1();
+          pass = account->getPassword().latin1();
+        }
 
     m_pop3 = mailpop3_new( 200, &pop3_progress );
 
     // connect
     if (account->getSSL()) {
         err = mailpop3_ssl_connect( m_pop3, (char*)server, port );
     } else {
         err = mailpop3_socket_connect( m_pop3, (char*)server, port );
     }
 
     if ( err != MAILPOP3_NO_ERROR ) {
         qDebug( "pop3: error connecting to %s\n reason: %s", server,
                 m_pop3->pop3_response );
         mailpop3_free( m_pop3 );
         m_pop3 = NULL;
         return;
diff --git a/noncore/net/mail/pop3wrapper.cpp b/noncore/net/mail/pop3wrapper.cpp
index 22a4c70..b0b985c 100644
--- a/noncore/net/mail/pop3wrapper.cpp
+++ b/noncore/net/mail/pop3wrapper.cpp
@@ -1,19 +1,20 @@
 #include <stdlib.h>
 #include "pop3wrapper.h"
 #include "mailtypes.h"
+#include "logindialog.h"
 #include <libetpan/mailpop3.h>
 #include <libetpan/mailmime.h>
 #include <libetpan/data_message_driver.h>
 #include <qfile.h>
 
 /* we don't fetch messages larger than 5 MB */
 #define HARD_MSG_SIZE_LIMIT 5242880
 
 POP3wrapper::POP3wrapper( POP3account *a )
 {
     account = a;
     m_pop3 = NULL;
     msgTempName = a->getFileName()+"_msg_cache";
     last_msg_id = 0;
 }
 
@@ -344,34 +345,49 @@ QString POP3wrapper::parseMailboxList( mailimf_mailbox_list *list )
     }
     
     return result;
 }
 
 void POP3wrapper::login()
 {
     /* we'll hold the line */
     if ( m_pop3 != NULL ) return;
 
     const char *server, *user, *pass;
     uint16_t port;
     int err = MAILPOP3_NO_ERROR;
 
     server = account->getServer().latin1();
     port = account->getPort().toUInt();
-    user = account->getUser().latin1();
-    pass = account->getPassword().latin1();
+
+        if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) {
+          LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true );
+          login.show();
+          if ( QDialog::Accepted == login.exec() ) {
+                // ok
+                user = strdup( login.getUser().latin1() );
+                pass = strdup( login.getPassword().latin1() );
+          } else {
+                // cancel
+                qDebug( "POP3: Login canceled" );
+                return;
+          }
+        } else {
+          user = account->getUser().latin1();
+          pass = account->getPassword().latin1();
+        }
 
     m_pop3 = mailpop3_new( 200, &pop3_progress );
 
     // connect
     if (account->getSSL()) {
         err = mailpop3_ssl_connect( m_pop3, (char*)server, port );
     } else {
         err = mailpop3_socket_connect( m_pop3, (char*)server, port );
     }
 
     if ( err != MAILPOP3_NO_ERROR ) {
         qDebug( "pop3: error connecting to %s\n reason: %s", server,
                 m_pop3->pop3_response );
         mailpop3_free( m_pop3 );
         m_pop3 = NULL;
         return;