From d0de397e46581f6ed5fcfad320b2b61be3858c5d Mon Sep 17 00:00:00 2001 From: groucho Date: Tue, 15 Apr 2003 08:07:53 +0000 Subject: - SMTP fix preventing authorization with SMTP after POP - removed debug output - smaller bug fixes --- diff --git a/noncore/net/mailit/addresslist.cpp b/noncore/net/mailit/addresslist.cpp index 9fe558a..8d9ab91 100644 --- a/noncore/net/mailit/addresslist.cpp +++ b/noncore/net/mailit/addresslist.cpp @@ -127,7 +127,7 @@ void AddressList::read() { //oc=(OContact*) it; if ((*it).defaultEmail().length()!=0) - addContact((*it).defaultEmail(),(*it).fullName()); + addContact((*it).defaultEmail(),(*it).fileAs()); } /*if (! f.open(IO_ReadOnly) ) diff --git a/noncore/net/mailit/emailclient.cpp b/noncore/net/mailit/emailclient.cpp index 6612541..0d82a9a 100644 --- a/noncore/net/mailit/emailclient.cpp +++ b/noncore/net/mailit/emailclient.cpp @@ -532,7 +532,7 @@ void EmailClient::readMail() QFile f(getPath(FALSE) + "inbox.txt"); // QFileInfo fi(f); - qDebug( f.name()); + //qDebug( f.name()); if ( f.open(IO_ReadOnly) ) { // file opened successfully QTextStream t( &f ); // use a text stream @@ -586,12 +586,12 @@ void EmailClient::saveMail(QString fileName, QListView *view) return; } item = (EmailListItem *) view->firstChild(); - qDebug (QString("Write : ") ); + //qDebug (QString("Write : ") ); QTextStream t(&f); while (item != NULL) { mail = item->getMail(); - qDebug(mail->rawMail); - qDebug(mail->recipients.first()); + //qDebug(mail->rawMail); + //qDebug(mail->recipients.first()); t << mail->rawMail; mailconf->setGroup(mail->id); diff --git a/noncore/net/mailit/emailhandler.cpp b/noncore/net/mailit/emailhandler.cpp index 9c1c814..03f8a28 100644 --- a/noncore/net/mailit/emailhandler.cpp +++ b/noncore/net/mailit/emailhandler.cpp @@ -163,8 +163,6 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail) temp = lineShift + "." + lineShift; if (in.right(temp.length()) != temp) { - qWarning(in.right(temp.length())); - qWarning(" . added at end of email as separator"); mail->rawMail += temp; } diff --git a/noncore/net/mailit/mailitwindow.cpp b/noncore/net/mailit/mailitwindow.cpp index fd49c1f..2bf1dcb 100644 --- a/noncore/net/mailit/mailitwindow.cpp +++ b/noncore/net/mailit/mailitwindow.cpp @@ -27,11 +27,9 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) views = new QWidgetStack(this); setCentralWidget(views); - qWarning("***Starting writeMail"); emailClient = new EmailClient(views, "client"); writeMail = new WriteMail(views, "writing"); readMail = new ReadMail(views, "reading"); - qWarning("***Finished readMail"); views->raiseWidget(emailClient); @@ -60,7 +58,6 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) this, SLOT(updateCaption(const QString &)) ); viewingMail = FALSE; - qWarning("***Finished MailitWindow"); } MailItWindow::~MailItWindow() diff --git a/noncore/net/mailit/popclient.cpp b/noncore/net/mailit/popclient.cpp index 2f14ed2..f9cc337 100644 --- a/noncore/net/mailit/popclient.cpp +++ b/noncore/net/mailit/popclient.cpp @@ -119,7 +119,7 @@ void PopClient::incomingData() // return; response = socket->readLine(); - qDebug(response +" %d", status); + //qDebug(response +" %d", status); switch(status) { //logging in @@ -131,7 +131,7 @@ void PopClient::incomingData() { timeStamp = response.mid( start , end - start + 1); md5Source = timeStamp + popPassword; - qDebug( md5Source); + //qDebug( md5Source); // for( int i = 0; i < md5Source.length(); i++) { // buff[i] = (QChar)md5Source[i]; // } @@ -192,7 +192,7 @@ void PopClient::incomingData() //messages deleted from server, reload all if (newMessages < lastSync) lastSync = 0; - messageCount = lastSync + 1; + messageCount = 1; } if (selected) { @@ -240,7 +240,7 @@ void PopClient::incomingData() status = Retr; } else { - qWarning(response); + //qWarning(response); errorHandling(ErrUnknownResponse); } } @@ -286,7 +286,7 @@ void PopClient::incomingData() if ( (!preview ) || ((preview) && (mailSize <= headerLimit)) ){ emit newMessage(message, messageCount-1, mailSize, TRUE); } else { //incomplete mail downloaded - emit newMessage(message, messageCount-1, mailSize, FALSE); + emit newMessage(message, messageCount-1, mailSize, FALSE); } if (messageCount > newMessages) //that was the last message status = Quit; diff --git a/noncore/net/mailit/readmail.cpp b/noncore/net/mailit/readmail.cpp index a5e7147..7cd3e09 100644 --- a/noncore/net/mailit/readmail.cpp +++ b/noncore/net/mailit/readmail.cpp @@ -89,6 +89,7 @@ void ReadMail::init() viewMenu->insertItem(Resource::loadPixmap("close"), "Close", this, SLOT(close())); emailView = new QTextView( this, "emailView" ); + setCentralWidget(emailView); mime = new QMimeSourceFactory(); diff --git a/noncore/net/mailit/smtpclient.cpp b/noncore/net/mailit/smtpclient.cpp index 6699a90..b2e38e5 100644 --- a/noncore/net/mailit/smtpclient.cpp +++ b/noncore/net/mailit/smtpclient.cpp @@ -87,7 +87,7 @@ void SmtpClient::incomingData() return; response = socket->readLine(); - qDebug(response); + //qDebug(response); switch(status) { case Init: { @@ -95,15 +95,15 @@ void SmtpClient::incomingData() status = From; mailPtr = mailList.first(); *stream << "HELO there\r\n"; - qDebug("HELO"); + //qDebug("HELO"); } else errorHandling(ErrUnknownResponse); break; } case From: { if (response[0] == '2') { - *stream << "MAIL FROM: <" << mailPtr->from << ">\r\n"; + *stream << "MAIL FROM: " << mailPtr->from << "\r\n"; status = Recv; - qDebug("MAIL FROM: "+mailPtr->from); + //qDebug("MAIL FROM: "+mailPtr->from); } else errorHandling(ErrUnknownResponse); break; } @@ -112,8 +112,8 @@ void SmtpClient::incomingData() it = mailPtr->to.begin(); if (it == NULL) errorHandling(ErrUnknownResponse); - *stream << "RCPT TO: <" << *it << ">\r\n"; - qDebug("RCPT TO: "+ *it); + *stream << "RCPT TO: " << *it << ">\r\n"; + //qDebug("RCPT TO: "+ *it); status = MRcv; } else errorHandling(ErrUnknownResponse); break; @@ -123,7 +123,7 @@ void SmtpClient::incomingData() it++; if ( it != mailPtr->to.end() ) { *stream << "RCPT TO: <" << *it << ">\r\n"; - qDebug("RCPT TO: "+ *it); + //qDebug("RCPT TO: "+ *it); break; } else { status = Data; @@ -134,7 +134,7 @@ void SmtpClient::incomingData() if (response[0] == '2') { *stream << "DATA\r\n"; status = Body; - qDebug("DATA"); + //qDebug("DATA"); emit updateStatus(tr("Sending: ") + mailPtr->subject); } else errorHandling(ErrUnknownResponse); break; @@ -148,7 +148,7 @@ void SmtpClient::incomingData() } else { status = Quit; } - qDebug("BODY"); + //qDebug("BODY"); } else errorHandling(ErrUnknownResponse); break; } @@ -163,7 +163,7 @@ void SmtpClient::incomingData() mailList.clear(); sending = FALSE; socket->close(); - qDebug("QUIT"); + //qDebug("QUIT"); } else errorHandling(ErrUnknownResponse); break; } diff --git a/noncore/unsupported/mailit/addresslist.cpp b/noncore/unsupported/mailit/addresslist.cpp index 9fe558a..8d9ab91 100644 --- a/noncore/unsupported/mailit/addresslist.cpp +++ b/noncore/unsupported/mailit/addresslist.cpp @@ -127,7 +127,7 @@ void AddressList::read() { //oc=(OContact*) it; if ((*it).defaultEmail().length()!=0) - addContact((*it).defaultEmail(),(*it).fullName()); + addContact((*it).defaultEmail(),(*it).fileAs()); } /*if (! f.open(IO_ReadOnly) ) diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp index 6612541..0d82a9a 100644 --- a/noncore/unsupported/mailit/emailclient.cpp +++ b/noncore/unsupported/mailit/emailclient.cpp @@ -532,7 +532,7 @@ void EmailClient::readMail() QFile f(getPath(FALSE) + "inbox.txt"); // QFileInfo fi(f); - qDebug( f.name()); + //qDebug( f.name()); if ( f.open(IO_ReadOnly) ) { // file opened successfully QTextStream t( &f ); // use a text stream @@ -586,12 +586,12 @@ void EmailClient::saveMail(QString fileName, QListView *view) return; } item = (EmailListItem *) view->firstChild(); - qDebug (QString("Write : ") ); + //qDebug (QString("Write : ") ); QTextStream t(&f); while (item != NULL) { mail = item->getMail(); - qDebug(mail->rawMail); - qDebug(mail->recipients.first()); + //qDebug(mail->rawMail); + //qDebug(mail->recipients.first()); t << mail->rawMail; mailconf->setGroup(mail->id); diff --git a/noncore/unsupported/mailit/emailhandler.cpp b/noncore/unsupported/mailit/emailhandler.cpp index 9c1c814..03f8a28 100644 --- a/noncore/unsupported/mailit/emailhandler.cpp +++ b/noncore/unsupported/mailit/emailhandler.cpp @@ -163,8 +163,6 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail) temp = lineShift + "." + lineShift; if (in.right(temp.length()) != temp) { - qWarning(in.right(temp.length())); - qWarning(" . added at end of email as separator"); mail->rawMail += temp; } diff --git a/noncore/unsupported/mailit/mailitwindow.cpp b/noncore/unsupported/mailit/mailitwindow.cpp index fd49c1f..2bf1dcb 100644 --- a/noncore/unsupported/mailit/mailitwindow.cpp +++ b/noncore/unsupported/mailit/mailitwindow.cpp @@ -27,11 +27,9 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) views = new QWidgetStack(this); setCentralWidget(views); - qWarning("***Starting writeMail"); emailClient = new EmailClient(views, "client"); writeMail = new WriteMail(views, "writing"); readMail = new ReadMail(views, "reading"); - qWarning("***Finished readMail"); views->raiseWidget(emailClient); @@ -60,7 +58,6 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) this, SLOT(updateCaption(const QString &)) ); viewingMail = FALSE; - qWarning("***Finished MailitWindow"); } MailItWindow::~MailItWindow() diff --git a/noncore/unsupported/mailit/popclient.cpp b/noncore/unsupported/mailit/popclient.cpp index 2f14ed2..f9cc337 100644 --- a/noncore/unsupported/mailit/popclient.cpp +++ b/noncore/unsupported/mailit/popclient.cpp @@ -119,7 +119,7 @@ void PopClient::incomingData() // return; response = socket->readLine(); - qDebug(response +" %d", status); + //qDebug(response +" %d", status); switch(status) { //logging in @@ -131,7 +131,7 @@ void PopClient::incomingData() { timeStamp = response.mid( start , end - start + 1); md5Source = timeStamp + popPassword; - qDebug( md5Source); + //qDebug( md5Source); // for( int i = 0; i < md5Source.length(); i++) { // buff[i] = (QChar)md5Source[i]; // } @@ -192,7 +192,7 @@ void PopClient::incomingData() //messages deleted from server, reload all if (newMessages < lastSync) lastSync = 0; - messageCount = lastSync + 1; + messageCount = 1; } if (selected) { @@ -240,7 +240,7 @@ void PopClient::incomingData() status = Retr; } else { - qWarning(response); + //qWarning(response); errorHandling(ErrUnknownResponse); } } @@ -286,7 +286,7 @@ void PopClient::incomingData() if ( (!preview ) || ((preview) && (mailSize <= headerLimit)) ){ emit newMessage(message, messageCount-1, mailSize, TRUE); } else { //incomplete mail downloaded - emit newMessage(message, messageCount-1, mailSize, FALSE); + emit newMessage(message, messageCount-1, mailSize, FALSE); } if (messageCount > newMessages) //that was the last message status = Quit; diff --git a/noncore/unsupported/mailit/readmail.cpp b/noncore/unsupported/mailit/readmail.cpp index a5e7147..7cd3e09 100644 --- a/noncore/unsupported/mailit/readmail.cpp +++ b/noncore/unsupported/mailit/readmail.cpp @@ -89,6 +89,7 @@ void ReadMail::init() viewMenu->insertItem(Resource::loadPixmap("close"), "Close", this, SLOT(close())); emailView = new QTextView( this, "emailView" ); + setCentralWidget(emailView); mime = new QMimeSourceFactory(); diff --git a/noncore/unsupported/mailit/smtpclient.cpp b/noncore/unsupported/mailit/smtpclient.cpp index 6699a90..b2e38e5 100644 --- a/noncore/unsupported/mailit/smtpclient.cpp +++ b/noncore/unsupported/mailit/smtpclient.cpp @@ -87,7 +87,7 @@ void SmtpClient::incomingData() return; response = socket->readLine(); - qDebug(response); + //qDebug(response); switch(status) { case Init: { @@ -95,15 +95,15 @@ void SmtpClient::incomingData() status = From; mailPtr = mailList.first(); *stream << "HELO there\r\n"; - qDebug("HELO"); + //qDebug("HELO"); } else errorHandling(ErrUnknownResponse); break; } case From: { if (response[0] == '2') { - *stream << "MAIL FROM: <" << mailPtr->from << ">\r\n"; + *stream << "MAIL FROM: " << mailPtr->from << "\r\n"; status = Recv; - qDebug("MAIL FROM: "+mailPtr->from); + //qDebug("MAIL FROM: "+mailPtr->from); } else errorHandling(ErrUnknownResponse); break; } @@ -112,8 +112,8 @@ void SmtpClient::incomingData() it = mailPtr->to.begin(); if (it == NULL) errorHandling(ErrUnknownResponse); - *stream << "RCPT TO: <" << *it << ">\r\n"; - qDebug("RCPT TO: "+ *it); + *stream << "RCPT TO: " << *it << ">\r\n"; + //qDebug("RCPT TO: "+ *it); status = MRcv; } else errorHandling(ErrUnknownResponse); break; @@ -123,7 +123,7 @@ void SmtpClient::incomingData() it++; if ( it != mailPtr->to.end() ) { *stream << "RCPT TO: <" << *it << ">\r\n"; - qDebug("RCPT TO: "+ *it); + //qDebug("RCPT TO: "+ *it); break; } else { status = Data; @@ -134,7 +134,7 @@ void SmtpClient::incomingData() if (response[0] == '2') { *stream << "DATA\r\n"; status = Body; - qDebug("DATA"); + //qDebug("DATA"); emit updateStatus(tr("Sending: ") + mailPtr->subject); } else errorHandling(ErrUnknownResponse); break; @@ -148,7 +148,7 @@ void SmtpClient::incomingData() } else { status = Quit; } - qDebug("BODY"); + //qDebug("BODY"); } else errorHandling(ErrUnknownResponse); break; } @@ -163,7 +163,7 @@ void SmtpClient::incomingData() mailList.clear(); sending = FALSE; socket->close(); - qDebug("QUIT"); + //qDebug("QUIT"); } else errorHandling(ErrUnknownResponse); break; } -- cgit v0.9.0.2